Changeset 9d3260a4b8dbc4dd64a162b37f1b6fa4f460a938

Timestamp:

11/30/11 17:14:01 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[dfec9683c6674557f3639bb6485d369ebd6a347b]

git-author:

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

Message:

Make sure we compile with Clang (trunk) even with -Wall -Werror (everywhere)

When (temporarily) adding -Werror -Wall to SHCFLAGS we'll get a lot more
failures. This patchset gurantees that all of them are fixed.
While we now can pass a compile with Clang we're still far away from
passing through GCC 4.6.1

Files:

• src/modules/handoff_ingestor.c (modified) (1 diff)
• src/modules/httptrap.c (modified) (1 diff)
• src/modules/librabbitmq/amqp_api.c (modified) (4 diffs)
• src/modules/librabbitmq/amqp_connection.c (modified) (6 diffs)
• src/modules/librabbitmq/amqp_framing.c (modified) (13 diffs)
• src/modules/librabbitmq/amqp_socket.c (modified) (6 diffs)
• src/modules/librabbitmq/amqp_table.c (modified) (2 diffs)
• src/modules/lua.c (modified) (2 diffs)
• src/modules/lua_noit.c (modified) (1 diff)
• src/modules/rabbitmq_driver.c (modified) (2 diffs)

src/modules/handoff_ingestor.c

@@ -59 +59 @@
-static noit_log_stream_t ds_err = NULL;
-static noit_log_stream_t ds_deb = NULL;
-static noit_log_stream_t ds_pool_deb = NULL;
-static noit_log_stream_t ingest_err = NULL;
-

src/modules/httptrap.c

@@ -413 +413 @@
-static int noit_httptrap_init(noit_module_t *self) {
-  const char *config_val;
-  int sockaddr_len;
-  httptrap_mod_config_t *conf;
-  conf = noit_module_get_userdata(self);

src/modules/librabbitmq/amqp_api.c

@@ -55 +55 @@
-  amqp_basic_properties_t default_properties;
-
-
+(void)
-
-  if (properties == NULL) {
@@ -67 +67 @@
-  f.payload.properties.body_size = body.len;
-  f.payload.properties.decoded = (void *) properties;
-
+(void)
-
-  body_offset = 0;
@@ -87 +87 @@
-
-    body_offset += f.payload.body_fragment.len;
-
+(void)
-  }
-
@@ -224 +224 @@
-      .multiple = multiple
-    };
-
+(void)
-  return 0;
-}

src/modules/librabbitmq/amqp_connection.c

@@ -210 +210 @@
-          decoded_frame->frame_type = AMQP_FRAME_METHOD;
-          decoded_frame->payload.method.id = D_32(state->inbound_buffer, HEADER_SIZE);
-
+(void)
-                                               &state->decoding_pool,
-                                               encoded,
@@ -227 +227 @@
-          decoded_frame->payload.properties.class_id = D_16(state->inbound_buffer, HEADER_SIZE);
-          decoded_frame->payload.properties.body_size = D_64(state->inbound_buffer, HEADER_SIZE+4);
-
+(void)
-                                                   &state->decoding_pool,
-                                                   encoded,
@@ -382 +382 @@
-  switch (separate_body) {
-    case 0:
-
+(void)
-                              state->outbound_buffer.bytes,
-                              payload_len + (HEADER_SIZE + FOOTER_SIZE)));
@@ -388 +388 @@
-
-    case 1:
-
-
+(void)
+(void)
-      {
-        assert(FOOTER_SIZE == 1);
-        unsigned char frame_end_byte = AMQP_FRAME_END;
-
+(void)
-      }
-      return 0;
@@ -414 +414 @@
-  switch (separate_body) {
-    case 0:
-
+(void)
-                           state->outbound_buffer.bytes,
-                           payload_len + (HEADER_SIZE + FOOTER_SIZE)));
@@ -420 +420 @@
-
-    case 1:
-
-
+(void)
+(void)
-      {
-        assert(FOOTER_SIZE == 1);
-        unsigned char frame_end_byte = AMQP_FRAME_END;
-
+(void)
-      }
-      return 0;

src/modules/librabbitmq/amqp_framing.c

@@ -141 +141 @@
-      offset++;
-      table_result = amqp_decode_table(encoded, pool, &(m->server_properties), &offset);
-
+(void)
-      m->mechanisms.len = D_32(encoded, offset);
-      offset += 4;
@@ -156 +156 @@
-      amqp_connection_start_ok_t *m = (amqp_connection_start_ok_t *) amqp_pool_alloc(pool, sizeof(amqp_connection_start_ok_t));
-      table_result = amqp_decode_table(encoded, pool, &(m->client_properties), &offset);
-
+(void)
-      m->mechanism.len = D_8(encoded, offset);
-      offset++;
@@ -309 +309 @@
-      offset += m->reply_text.len;
-      table_result = amqp_decode_table(encoded, pool, &(m->details), &offset);
-
+(void)
-      *decoded = m;
-      return 0;
@@ -376 +376 @@
-      m->nowait = (bit_buffer & (1 << 4)) ? 1 : 0;
-      table_result = amqp_decode_table(encoded, pool, &(m->arguments), &offset);
-
+(void)
-      *decoded = m;
-      return 0;
@@ -421 +421 @@
-      m->nowait = (bit_buffer & (1 << 4)) ? 1 : 0;
-      table_result = amqp_decode_table(encoded, pool, &(m->arguments), &offset);
-
+(void)
-      *decoded = m;
-      return 0;
@@ -458 +458 @@
-      m->nowait = (bit_buffer & (1 << 0)) ? 1 : 0;
-      table_result = amqp_decode_table(encoded, pool, &(m->arguments), &offset);
-
+(void)
-      *decoded = m;
-      return 0;
@@ -528 +528 @@
-      offset += m->routing_key.len;
-      table_result = amqp_decode_table(encoded, pool, &(m->arguments), &offset);
-
+(void)
-      *decoded = m;
-      return 0;
@@ -1098 +1098 @@
-      amqp_tunnel_request_t *m = (amqp_tunnel_request_t *) amqp_pool_alloc(pool, sizeof(amqp_tunnel_request_t));
-      table_result = amqp_decode_table(encoded, pool, &(m->meta_data), &offset);
-
+(void)
-      *decoded = m;
-      return 0;
@@ -1151 +1151 @@
-      amqp_test_table_t *m = (amqp_test_table_t *) amqp_pool_alloc(pool, sizeof(amqp_test_table_t));
-      table_result = amqp_decode_table(encoded, pool, &(m->table), &offset);
-
+(void)
-      m->integer_op = D_8(encoded, offset);
-      offset++;
@@ -1253 +1253 @@
-      if (flags & AMQP_BASIC_HEADERS_FLAG) {
-        table_result = amqp_decode_table(encoded, pool, &(p->headers), &offset);
-
+(void)
-      }
-      if (flags & AMQP_BASIC_DELIVERY_MODE_FLAG) {
@@ -1335 +1335 @@
-      if (flags & AMQP_FILE_HEADERS_FLAG) {
-        table_result = amqp_decode_table(encoded, pool, &(p->headers), &offset);
-
+(void)
-      }
-      if (flags & AMQP_FILE_PRIORITY_FLAG) {
@@ -1389 +1389 @@
-      if (flags & AMQP_STREAM_HEADERS_FLAG) {
-        table_result = amqp_decode_table(encoded, pool, &(p->headers), &offset);
-
+(void)
-      }
-      if (flags & AMQP_STREAM_PRIORITY_FLAG) {
@@ -1419 +1419 @@
-      if (flags & AMQP_TUNNEL_HEADERS_FLAG) {
-        table_result = amqp_decode_table(encoded, pool, &(p->headers), &offset);
-
+(void)
-      }
-      if (flags & AMQP_TUNNEL_PROXY_NAME_FLAG) {

src/modules/librabbitmq/amqp_socket.c

@@ -165 +165 @@
-      buffer.len = state->sock_inbound_limit - state->sock_inbound_offset;
-      buffer.bytes = ((char *) state->sock_inbound_buffer.bytes) + state->sock_inbound_offset;
-
+(void)
-      state->sock_inbound_offset += result;
-
@@ -216 +216 @@
-  amqp_frame_t frame;
-
-
+(void)
-  amqp_assert(frame.channel == expected_channel,
-              "Expected 0x%08X method frame on channel %d, got frame on channel %d",
@@ -352 +352 @@
-  amqp_send_header(state);
-
-
+(void)
-  {
-    amqp_connection_start_t *s = (amqp_connection_start_t *) method.decoded;
@@ -374 +374 @@
-        .locale = {.len = 5, .bytes = "en_US"}
-      };
-
+(void)
-  }
-
-  amqp_release_buffers(state);
-
-
+(void)
-  {
-    amqp_connection_tune_t *s = (amqp_connection_tune_t *) method.decoded;
@@ -404 +404 @@
-  }
-
-
+(void)
-
-  {
@@ -413 +413 @@
-        .heartbeat = heartbeat
-      };
-
+(void)
-  }
-

src/modules/librabbitmq/amqp_table.c

@@ -79 +79 @@
-        break;
-      case 'F':
-
+(void)
-        break;
-      default:
@@ -142 +142 @@
-        break;
-      case 'F':
-
+(void)
-        break;
-      default:

src/modules/lua.c

@@ -252 +252 @@
-  char av[2] = { '\0', '\0' };
-  noit_check_t *check;
-  noit_lua_check_info_t *ci;
-  if(lua_gettop(L)) luaL_error(L, "wrong number of arguments");
-  check = lua_touserdata(L, lua_upvalueindex(1));
@@ -273 +272 @@
-  char status[2] = { '\0', '\0' };
-  noit_check_t *check;
-  noit_lua_check_info_t *ci;
-  if(lua_gettop(L)) luaL_error(L, "wrong number of arguments");
-  check = lua_touserdata(L, lua_upvalueindex(1));

src/modules/lua_noit.c

@@ -529 +529 @@
-  noit_lua_check_info_t *ci;
-  eventer_t e, *eptr;
-  struct timeval now;
-  int tmpmask, rv;
-

src/modules/rabbitmq_driver.c

@@ -130 +130 @@
-static void noit_rabbimq_deallocate(iep_thread_driver_t *d) {
-  struct amqp_driver *dr = (struct amqp_driver *)d;
-  int i;
-  noit_rabbimq_disconnect(d);
-  pthread_mutex_lock(&driver_lock);
-
+*
-  pthread_mutex_unlock(&driver_lock);
-  noit_atomic_dec64(&stats.concurrency);
@@ -414 +413 @@
-  }
-  pthread_mutex_unlock(&driver_lock);
-
+
+
+
-static void
-register_console_rabbitmq_commands() {