You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2008/11/05 12:35:56 UTC
svn commit: r711553 - in /webservices/axis2/trunk/c: axiom/src/attachments/
src/core/transport/http/util/ util/ util/include/platforms/unix/ util/src/
util/src/platforms/unix/
Author: pini
Date: Wed Nov 5 03:35:56 2008
New Revision: 711553
URL: http://svn.apache.org/viewvc?rev=711553&view=rev
Log:
Fixing jira issue 1285
Modified:
webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/util/configure.ac
webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h
webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c
webservices/axis2/trunk/c/util/src/string.c
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?rev=711553&r1=711552&r2=711553&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Wed Nov 5 03:35:56 2008
@@ -1748,7 +1748,7 @@
type++;
}
end = type;
- while (end && *end && !isspace(*end))
+ while (end && *end && !isspace((int)*end))
{
end++;
}
Modified: webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c?rev=711553&r1=711552&r2=711553&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c Wed Nov 5 03:35:56 2008
@@ -1427,7 +1427,7 @@
for (; *src != AXIS2_ESC_NULL; ++dest, ++src)
{
- if (src[0] == AXIS2_PERCENT && isxdigit(src[1]) && isxdigit(src[2]))
+ if (src[0] == AXIS2_PERCENT && isxdigit((int)src[1]) && isxdigit((int)src[2]))
{
*dest = (axis2_char_t)(axis2_http_transport_utils_hexit(src[1]) * 16 +
axis2_http_transport_utils_hexit(src[2]));
Modified: webservices/axis2/trunk/c/util/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/configure.ac?rev=711553&r1=711552&r2=711553&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/configure.ac (original)
+++ webservices/axis2/trunk/c/util/configure.ac Wed Nov 5 03:35:56 2008
@@ -46,6 +46,11 @@
AC_CHECK_LIB(dl, dlopen)
AC_CHECK_LIB(z, inflate)
+dnl This can be removed when the ftime call in
+dnl ./util/src/platforms/unix/date_time_util_unix.c
+dnl is changed to call gettimeofday
+AC_CHECK_LIB(compat, ftime)
+
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
@@ -99,6 +104,7 @@
dnl AC_FUNC_MALLOC
dnl AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
+AC_CHECK_FUNCS(getifaddrs)
# System-dependent adjustments.
cygwin=no
Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h?rev=711553&r1=711552&r2=711553&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_date_time_util_unix.h Wed Nov 5 03:35:56 2008
@@ -21,6 +21,7 @@
#include <axutil_utils.h>
#include <axutil_utils_defines.h>
#include <stdio.h>
+#include <sys/types.h>
#include <sys/timeb.h>
#include <time.h>
Modified: webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c?rev=711553&r1=711552&r2=711553&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c Wed Nov 5 03:35:56 2008
@@ -44,7 +44,7 @@
# include <net/if_dl.h>
# endif
#endif
-#ifdef IS_MACOSX
+#ifdef HAVE_GETIFADDRS
#include <ifaddrs.h>
#endif
#include <platforms/unix/axutil_uuid_gen_unix.h>
@@ -267,7 +267,7 @@
#else
-#ifdef IS_MACOSX /* Darwin */
+#ifdef HAVE_GETIFADDRS /* NetBSD, MacOSX, etc... */
#ifndef max
# define max(a,b) ((a) > (b) ? (a) : (b))
Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?rev=711553&r1=711552&r2=711553&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Wed Nov 5 03:35:56 2008
@@ -571,14 +571,14 @@
*str2 = (axis2_char_t *) s2;
int i = (int) n;
- while (--i >= 0 && toupper(*str1) == toupper(*str2++))
+ while (--i >= 0 && toupper((int)*str1) == toupper((int)*str2++))
{
- if (toupper(*str1++) == '\0')
+ if (toupper((int)*str1++) == '\0')
{
return (0);
}
}
- return (i < 0 ? 0 : toupper(*str1) - toupper(*--str2));
+ return (i < 0 ? 0 : toupper((int)*str1) - toupper((int)*--str2));
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
@@ -795,7 +795,7 @@
axis2_char_t *temp_str = NULL;
for (temp_str = str; *temp_str != '\0'; temp_str++)
{
- *temp_str = (axis2_char_t)tolower(*temp_str);
+ *temp_str = (axis2_char_t)tolower((int)*temp_str);
/* We are sure that the conversion is safe */
}
return str;
@@ -808,7 +808,7 @@
axis2_char_t *temp_str = NULL;
for (temp_str = str; *temp_str != '\0'; temp_str++)
{
- *temp_str = (axis2_char_t)toupper(*temp_str);
+ *temp_str = (axis2_char_t)toupper((int)*temp_str);
/* We are sure that the conversion is safe */
}
return str;
@@ -840,7 +840,7 @@
return NULL;
}
}
- while (toupper(current) != toupper(start));
+ while (toupper((int)current) != toupper((int)start));
}
while (axutil_strncasecmp(haystack, needle, (int)len));
/* We are sure that the difference lies within the int range */