X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbstok_r.c;h=d0f2be4b02e23cd6360337f288e406966bf0e395;hb=c0920188a9d9d5405cb9639d7ae07d9cae2161bf;hp=b698d3fad256da9086235ee6bd62d9aaa95f7419;hpb=4eda4ba54f3cf29f6b7fe4458e719cd2325be4c4;p=gnulib.git diff --git a/lib/mbstok_r.c b/lib/mbstok_r.c index b698d3fad..d0f2be4b0 100644 --- a/lib/mbstok_r.c +++ b/lib/mbstok_r.c @@ -1,5 +1,5 @@ /* Tokenizing a string. - Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software: you can redistribute it and/or modify @@ -28,35 +28,35 @@ mbstok_r (char *string, const char *delim, char **save_ptr) if (MB_CUR_MAX > 1) { if (string == NULL) - { - string = *save_ptr; - if (string == NULL) - return NULL; /* reminder that end of token sequence has been - reached */ - } + { + string = *save_ptr; + if (string == NULL) + return NULL; /* reminder that end of token sequence has been + reached */ + } /* Skip leading delimiters. */ string += mbsspn (string, delim); /* Found a token? */ if (*string == '\0') - { - *save_ptr = NULL; - return NULL; - } + { + *save_ptr = NULL; + return NULL; + } /* Move past the token. */ { - char *token_end = mbspbrk (string, delim); + char *token_end = mbspbrk (string, delim); - if (token_end != NULL) - { - /* NUL-terminate the token. */ - *token_end = '\0'; - *save_ptr = token_end + 1; - } - else - *save_ptr = NULL; + if (token_end != NULL) + { + /* NUL-terminate the token. */ + *token_end = '\0'; + *save_ptr = token_end + 1; + } + else + *save_ptr = NULL; } return string;