Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: silencing compiler warnings from gcc 4
- X-seq: zsh-workers 21600
- From: Wayne Davison <wayned@xxxxxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxxxxx
- Subject: PATCH: silencing compiler warnings from gcc 4
- Date: Thu, 11 Aug 2005 13:02:52 -0700
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
Gcc 4 outputs a bunch of compiler warnings about string pointers that
differ in signedness. The warnings in a zsh build are limited to the
zle string functions defined in zle.h. I came up with 2 solutions:
(1) change the ZS_str* macros to cast their args to (char*), or (2)
introduce some static inline functions to handle the casts. The
advantage of the latter is that it doesn't hide pointer-conversion
errors behind forced casts. For instance, after I compiled the inline
version it showed several places in the code that were using ZWC() on
strings instead of ZWS() (which I already fixed and checked in).
As for the portability of "inline", there is an autoconf macro that I
included, AC_C_INLINE, that redefines the word "inline" as appropriate.
The rsync package used a static inline function in its rsync.h for many
years (thought I eliminated it recently), so it would seem to be quite
portable.
Comments?
..wayne..
--- configure.ac 1 Aug 2005 09:54:56 -0000 1.37
+++ configure.ac 11 Aug 2005 18:42:00 -0000
@@ -437,6 +437,7 @@ AC_SUBST(LIBLDFLAGS)dnl
AC_PROG_CPP dnl Figure out how to run C preprocessor.
AC_PROG_GCC_TRADITIONAL dnl Do we need -traditional flag for gcc.
AC_C_CONST dnl Does compiler support `const'.
+AC_C_INLINE
dnl Default preprocessing on Mac OS X produces warnings
case "$host_os" in
--- Src/Zle/zle.h 10 Aug 2005 10:56:41 -0000 1.15
+++ Src/Zle/zle.h 11 Aug 2005 18:42:00 -0000
@@ -89,10 +89,20 @@ typedef int ZLE_INT_T;
#define ZS_memmove memmove
#define ZS_memset memset
#define ZS_memcmp memcmp
-#define ZS_strlen strlen
-#define ZS_strcpy strcpy
-#define ZS_strncpy strncpy
-#define ZS_strncmp strncmp
+
+static inline size_t ZS_strlen(ZLE_STRING_T s);
+static inline ZLE_STRING_T ZS_strcpy(ZLE_STRING_T t, ZLE_STRING_T f);
+static inline ZLE_STRING_T ZS_strncpy(ZLE_STRING_T t, ZLE_STRING_T f, size_t l);
+static inline int ZS_strncmp(ZLE_STRING_T s1, ZLE_STRING_T s2, size_t l);
+
+static inline size_t ZS_strlen(ZLE_STRING_T s)
+{ return strlen((char*)s); }
+static inline ZLE_STRING_T ZS_strcpy(ZLE_STRING_T t, ZLE_STRING_T f)
+{ return (ZLE_STRING_T)strcpy((char*)t, (char*)f); }
+static inline ZLE_STRING_T ZS_strncpy(ZLE_STRING_T t, ZLE_STRING_T f, size_t l)
+{ return (ZLE_STRING_T)strncpy((char*)t, (char*)f, l); }
+static inline int ZS_strncmp(ZLE_STRING_T s1, ZLE_STRING_T s2, size_t l)
+{ return strncmp((char*)s1, (char*)s2, l); }
#define ZC_iblank iblank
#define ZC_icntrl icntrl
--- Src/Zle/zle.h 10 Aug 2005 10:56:41 -0000 1.15
+++ Src/Zle/zle.h 11 Aug 2005 18:20:16 -0000
@@ -89,10 +89,10 @@ typedef int ZLE_INT_T;
#define ZS_memmove memmove
#define ZS_memset memset
#define ZS_memcmp memcmp
-#define ZS_strlen strlen
-#define ZS_strcpy strcpy
-#define ZS_strncpy strncpy
-#define ZS_strncmp strncmp
+#define ZS_strlen(s) strlen((char*)(s))
+#define ZS_strcpy(t,f) strcpy((char*)(t),(char*)(f))
+#define ZS_strncpy(t,f,l) strncpy((char*)(t),(char*)(f),(l))
+#define ZS_strncmp(s1,s2,l) strncmp((char*)(s1),(char*)(s2),(l))
#define ZC_iblank iblank
#define ZC_icntrl icntrl
Messages sorted by:
Reverse Date,
Date,
Thread,
Author