aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2013-01-25 21:44:48 +0100
committerPatrik Nyblom <[email protected]>2013-01-25 21:44:48 +0100
commitdebbee7ddf7b356f10f1dc12c874ed6e80c02c20 (patch)
tree42464367c52bb177cb037faa2faec70673a0fe34 /erts/etc/common
parent725618258bdd33e25e5a156f6774832054a6af9a (diff)
parent90b44f551fd3d988b34a9fb7d32598b789a0c546 (diff)
downloadotp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.tar.gz
otp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.tar.bz2
otp-debbee7ddf7b356f10f1dc12c874ed6e80c02c20.zip
Merge branch 'pan/fix-compiler-warnings-clang-and-new-gcc'
* pan/fix-compiler-warnings-clang-and-new-gcc: Fix compiler warnings from GCC 4.7.1 on ARCH Linux Fix clang compiler warnings on FreeBSD in erts
Diffstat (limited to 'erts/etc/common')
-rw-r--r--erts/etc/common/erlexec.c8
-rw-r--r--erts/etc/common/inet_gethost.c9
2 files changed, 6 insertions, 11 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index e56fc9d41e..577554c43d 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -184,7 +184,6 @@ void error(char* format, ...);
#if !defined(ERTS_HAVE_SMP_EMU)
static void usage_notsup(const char *switchname);
#endif
-static void usage_msg(const char *msg);
static char **build_args_from_env(char *env_var);
static char **build_args_from_string(char *env_var);
static void initial_argv_massage(int *argc, char ***argv);
@@ -1132,13 +1131,6 @@ usage_notsup(const char *switchname)
#endif
static void
-usage_msg(const char *msg)
-{
- fprintf(stderr, "%s\n", msg);
- usage_aux();
-}
-
-static void
usage_format(char *format, ...)
{
va_list args;
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c
index b9a0e6bde3..bef97862a3 100644
--- a/erts/etc/common/inet_gethost.c
+++ b/erts/etc/common/inet_gethost.c
@@ -2562,7 +2562,8 @@ static void debugf(char *format, ...)
}
#else
/* suppress warning with 'if' */
- if(write(2,buff,strlen(buff)));
+ if(write(2,buff,strlen(buff)))
+ ;
#endif
va_end(ap);
}
@@ -2585,7 +2586,8 @@ static void warning(char *format, ...)
}
#else
/* suppress warning with 'if' */
- if(write(2,buff,strlen(buff)));
+ if(write(2,buff,strlen(buff)))
+ ;
#endif
va_end(ap);
}
@@ -2608,7 +2610,8 @@ static void fatal(char *format, ...)
}
#else
/* suppress warning with 'if' */
- if(write(2,buff,strlen(buff)));
+ if(write(2,buff,strlen(buff)))
+ ;
#endif
va_end(ap);
#ifndef WIN32