X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbsnrtowcs.c;h=0b6d5b4032f7d1f0ee6287439ccc1de21d7edd7e;hb=fa43e0af674cf072f407fda6ec95cae536f4e4a0;hp=57db98d29dfcc18acc83b1837df980ed0181bbc2;hpb=6906a95bfc7fc83e4ffa7ef2f68e377157d926f7;p=gnulib.git

diff --git a/lib/mbsnrtowcs.c b/lib/mbsnrtowcs.c
index 57db98d29..0b6d5b403 100644
--- a/lib/mbsnrtowcs.c
+++ b/lib/mbsnrtowcs.c
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -40,94 +40,94 @@ mbsnrtowcs (wchar_t *dest, const char **srcp, size_t srclen, size_t len, mbstate
 
     if (dest != NULL)
       {
-	wchar_t *destptr = dest;
-
-	for (; srclen > 0 && len > 0; destptr++, len--)
-	  {
-	    size_t src_avail;
-	    size_t ret;
-
-	    /* An optimized variant of
-	       src_avail = strnlen1 (src, MIN (srclen, MB_LEN_MAX));  */
-	    if (srclen == 1 || src[0] == '\0')
-	      src_avail = 1;
-	    else if (srclen == 2 || src[1] == '\0')
-	      src_avail = 2;
-	    else if (srclen == 3 || src[2] == '\0')
-	      src_avail = 3;
-	    else if (MB_LEN_MAX <= 4 || srclen == 4 || src[3] == '\0')
-	      src_avail = 4;
-	    else
-	      src_avail = 4 + strnlen1 (src + 4, MIN (srclen, MB_LEN_MAX) - 4);
-
-	    /* Parse the next multibyte character.  */
-	    ret = mbrtowc (destptr, src, src_avail, ps);
-
-	    if (ret == (size_t)(-2))
-	      /* Encountered a multibyte character that extends past a '\0' byte
-		 or that is longer than MB_LEN_MAX bytes.  Cannot happen.  */
-	      abort ();
-
-	    if (ret == (size_t)(-1))
-	      goto bad_input;
-	    if (ret == 0)
-	      {
-		src = NULL;
-		/* Here mbsinit (ps).  */
-		break;
-	      }
-	    src += ret;
-	    srclen -= ret;
-	  }
-
-	*srcp = src;
-	return destptr - dest;
+        wchar_t *destptr = dest;
+
+        for (; srclen > 0 && len > 0; destptr++, len--)
+          {
+            size_t src_avail;
+            size_t ret;
+
+            /* An optimized variant of
+               src_avail = strnlen1 (src, MIN (srclen, MB_LEN_MAX));  */
+            if (srclen == 1 || src[0] == '\0')
+              src_avail = 1;
+            else if (srclen == 2 || src[1] == '\0')
+              src_avail = 2;
+            else if (srclen == 3 || src[2] == '\0')
+              src_avail = 3;
+            else if (MB_LEN_MAX <= 4 || srclen == 4 || src[3] == '\0')
+              src_avail = 4;
+            else
+              src_avail = 4 + strnlen1 (src + 4, MIN (srclen, MB_LEN_MAX) - 4);
+
+            /* Parse the next multibyte character.  */
+            ret = mbrtowc (destptr, src, src_avail, ps);
+
+            if (ret == (size_t)(-2))
+              /* Encountered a multibyte character that extends past a '\0' byte
+                 or that is longer than MB_LEN_MAX bytes.  Cannot happen.  */
+              abort ();
+
+            if (ret == (size_t)(-1))
+              goto bad_input;
+            if (ret == 0)
+              {
+                src = NULL;
+                /* Here mbsinit (ps).  */
+                break;
+              }
+            src += ret;
+            srclen -= ret;
+          }
+
+        *srcp = src;
+        return destptr - dest;
       }
     else
       {
-	/* Ignore dest and len, don't store *srcp at the end, and
-	   don't clobber *ps.  */
-	mbstate_t state = *ps;
-	size_t totalcount = 0;
-
-	for (; srclen > 0; totalcount++)
-	  {
-	    size_t src_avail;
-	    size_t ret;
-
-	    /* An optimized variant of
-	       src_avail = strnlen1 (src, MIN (srclen, MB_LEN_MAX));  */
-	    if (srclen == 1 || src[0] == '\0')
-	      src_avail = 1;
-	    else if (srclen == 2 || src[1] == '\0')
-	      src_avail = 2;
-	    else if (srclen == 3 || src[2] == '\0')
-	      src_avail = 3;
-	    else if (MB_LEN_MAX <= 4 || srclen == 4 || src[3] == '\0')
-	      src_avail = 4;
-	    else
-	      src_avail = 4 + strnlen1 (src + 4, MIN (srclen, MB_LEN_MAX) - 4);
-
-	    /* Parse the next multibyte character.  */
-	    ret = mbrtowc (NULL, src, src_avail, &state);
-
-	    if (ret == (size_t)(-2))
-	      /* Encountered a multibyte character that extends past a '\0' byte
-		 or that is longer than MB_LEN_MAX bytes.  Cannot happen.  */
-	      abort ();
-
-	    if (ret == (size_t)(-1))
-	      goto bad_input2;
-	    if (ret == 0)
-	      {
-		/* Here mbsinit (&state).  */
-		break;
-	      }
-	    src += ret;
-	    srclen -= ret;
-	  }
-
-	return totalcount;
+        /* Ignore dest and len, don't store *srcp at the end, and
+           don't clobber *ps.  */
+        mbstate_t state = *ps;
+        size_t totalcount = 0;
+
+        for (; srclen > 0; totalcount++)
+          {
+            size_t src_avail;
+            size_t ret;
+
+            /* An optimized variant of
+               src_avail = strnlen1 (src, MIN (srclen, MB_LEN_MAX));  */
+            if (srclen == 1 || src[0] == '\0')
+              src_avail = 1;
+            else if (srclen == 2 || src[1] == '\0')
+              src_avail = 2;
+            else if (srclen == 3 || src[2] == '\0')
+              src_avail = 3;
+            else if (MB_LEN_MAX <= 4 || srclen == 4 || src[3] == '\0')
+              src_avail = 4;
+            else
+              src_avail = 4 + strnlen1 (src + 4, MIN (srclen, MB_LEN_MAX) - 4);
+
+            /* Parse the next multibyte character.  */
+            ret = mbrtowc (NULL, src, src_avail, &state);
+
+            if (ret == (size_t)(-2))
+              /* Encountered a multibyte character that extends past a '\0' byte
+                 or that is longer than MB_LEN_MAX bytes.  Cannot happen.  */
+              abort ();
+
+            if (ret == (size_t)(-1))
+              goto bad_input2;
+            if (ret == 0)
+              {
+                /* Here mbsinit (&state).  */
+                break;
+              }
+            src += ret;
+            srclen -= ret;
+          }
+
+        return totalcount;
       }
 
    bad_input: