This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] build_wcs_upper_buffer definition


Hi,

I think I've found a small coding error in glibc which breaks my build.

build_wcs_upper_buffer is defined in posix/regex_internal.h to have a
return type of int, but it's used in posix/regex_internal.c and
posix/regexec.c with a return type of reg_errcode_t. This patch fixes
the problem:


2008-11-26  Chris Steel  <chris.steel.lnx@googlemail.com>

	* posix/regex_internal.h (build_wcs_upper_buffer): Change
	return type from int to reg_errcode_t to match usage in
	posix/regex_internal.c and posix/regex.c


diff -urN glibc-2.9-20081124-clean/posix/regex_internal.h
glibc-2.9-20081124/posix/regex_internal.h
--- glibc-2.9-20081124-clean/posix/regex_internal.h     2007-08-26
02:35:05.000000000 +0100
+++ glibc-2.9-20081124/posix/regex_internal.h   2008-11-25
11:43:12.482102615 +0000
@@ -391,7 +391,7 @@
     internal_function;
 # ifdef RE_ENABLE_I18N
 static void build_wcs_buffer (re_string_t *pstr) internal_function;
-static int build_wcs_upper_buffer (re_string_t *pstr) internal_function;
+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr)
internal_function;
 # endif /* RE_ENABLE_I18N */
 static void build_upper_buffer (re_string_t *pstr) internal_function;
 static void re_string_translate_buffer (re_string_t *pstr) internal_function;


No regressions on x86_64-linux-gnu. Fixes build failure for
arm-iwmmxt-linux-gnueabi

Regards,

Chris


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]