X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxvasprintf.c;h=6a8bac4a8866727b5578b3afca69a2310238c46c;hb=75ce01c4382e5acf45599baaade587f78ddfa956;hp=26828a1a9e3d0ed441cd957ba65672b71940e24f;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c index 26828a1a9..6a8bac4a8 100644 --- a/lib/xvasprintf.c +++ b/lib/xvasprintf.c @@ -1,5 +1,5 @@ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004, 2006-2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,11 +29,6 @@ /* Checked size_t computations. */ #include "xsize.h" -/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */ -#ifndef EOVERFLOW -# define EOVERFLOW E2BIG -#endif - static inline char * xstrcat (size_t argcount, va_list args) { @@ -91,23 +86,23 @@ xvasprintf (const char *format, va_list args) for (f = format;;) { - if (*f == '\0') - /* Recognized the special case of string concatenation. */ - return xstrcat (argcount, args); - if (*f != '%') - break; - f++; - if (*f != 's') - break; - f++; - argcount++; + if (*f == '\0') + /* Recognized the special case of string concatenation. */ + return xstrcat (argcount, args); + if (*f != '%') + break; + f++; + if (*f != 's') + break; + f++; + argcount++; } } if (vasprintf (&result, format, args) < 0) { if (errno == ENOMEM) - xalloc_die (); + xalloc_die (); return NULL; }