Changeset 4741bb2c566864b5d85b3216cded4131a1b69a57

Timestamp:

11/30/11 17:49:32 (1 year ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1322675372 -0500

git-parent:

[7b28cc85a1bc31833aad9c9189e7f8400a6bf16d]

git-author:

Igor Galić <i.galic@brainsware.org> 1322675303 -0500

Message:

compile with GCC 4.6.1

Some of the things you'll see here are ugly. Others I'm really not
proud of. There's really only a handful that are a catch by this
compiler and make actual sense..

Files:

• src/eventer/eventer_epoll_impl.c (modified) (2 diffs)
• src/modules/collectd.c (modified) (1 diff)
• src/noit_check_rest.c (modified) (1 diff)
• src/noit_console_state.c (modified) (1 diff)
• src/utils/noit_log.c (modified) (2 diffs)
• src/utils/noit_watchdog.c (modified) (1 diff)

src/eventer/eventer_epoll_impl.c

@@ -185 +185 @@
-static void eventer_epoll_impl_trigger(eventer_t e, int mask) {
-  struct timeval __now;
-oldmask, 
+
-  const char *cbname;
-  ev_lock_state_t lockstate;
@@ -196 +196 @@
-
-  gettimeofday(&__now, NULL);
-  oldmask = e->mask;
-  cbname = eventer_name_for_callback(e->callback);
-  noitLT(eventer_deb, &__now, "epoll: fire on %d/%x to %s(%p)\n",

src/modules/collectd.c

@@ -1418 +1418 @@
-  char ip_p[INET6_ADDRSTRLEN];
-  noit_module_t *self = (noit_module_t *)closure;
-  collectd_mod_config_t *conf;
-  conf = noit_module_get_userdata(self);
-
-
-  // Get the username and password of the string

src/noit_check_rest.c

@@ -488 +488 @@
- cleanup:
-  if(pobj) xmlXPathFreeObject(pobj);
+  (void)error;
-  return 0;
-}

src/noit_console_state.c

@@ -522 +522 @@
-    noit_console_state_add_cmd(_top_level_state, &console_command_restart);
-    noit_console_state_add_cmd(show_state, &console_command_version);
+    (void)no_state;
-
-    evdeb = noit_console_mksubdelegate(

src/utils/noit_log.c

@@ -220 +220 @@
-  rv = rename(ls->path, name);
-  if(lock) pthread_rwlock_unlock(lock);
--1
+rv
-}
-static logops_t posix_logio_ops = {
@@ -441 +441 @@
-static void
-noit_log_jlog_err(void *ctx, const char *format, ...) {
-  int rv;
-  struct timeval now;
-  va_list arg;
-  va_start(arg, format);
-  gettimeofday(&now, NULL);
-rv = 
+(void)
-  va_end(arg);
-}

src/utils/noit_watchdog.c

@@ -110 +110 @@
-    unused = system(cmd);
-  }
+  (void)unused;
-}
-