Fix sign compare warning

The type of return value of sizeof is size_t. Some build system enables
'-Wsign-compare' build option. It makes a build warning.
This patch adds a new variable to store the return value of sizeof. And,
it will be used to compare variables.

Change-Id: Iad724ec2ca88cc7b8d5c6cf6b3a15ed6b6c1dd3b
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/idlc/gen/c_group_body_gen_cb.h b/idlc/gen/c_group_body_gen_cb.h
index f27f2b46874b6a2f4643faf9155016aba0410e6b..6721555ba3bc55ca93ea444d3f4c5f8ef98b73b1 100644 (file)
--- a/idlc/gen/c_group_body_gen_cb.h
+++ b/idlc/gen/c_group_body_gen_cb.h
@@ -205,7 +205,9 @@ static void __<NAME>_event_system_cb(const char *event_name, bundle *event_data,
 
   _W("[Sequence] %d", seq_num);
   rpc_port_parcel_read_int32(p, &cmd);
-  if (cmd > 1 && cmd < ARRAY_SIZE(__<NAME>_method_table)) {
+
+  static const int table_size = ARRAY_SIZE(__<NAME>_method_table);
+  if (cmd > 1 && cmd < table_size) {
     if (__<NAME>_method_table[cmd])
       __<NAME>_method_table[cmd](p, handle);
   } else {

diff --git a/idlc/gen/c_proxy_body_gen_cb.h b/idlc/gen/c_proxy_body_gen_cb.h
index 780e4b52880e76e2d33274ab83bcc983d95e5c98..d646f16d1f33092a76464a6332151b6b4f6a588f 100644 (file)
--- a/idlc/gen/c_proxy_body_gen_cb.h
+++ b/idlc/gen/c_proxy_body_gen_cb.h
@@ -474,13 +474,14 @@ static void __<PREFIX>_<NAME>_process_received_event(GList **delegates, rpc_port
   int id = 0;
   int seq_id = 0;
   bool once = false;
+  static const int table_size = ARRAY_SIZE(__<PREFIX>_<NAME>_delegate_table);
 
   rpc_port_parcel_read_int32(parcel, &id);
   rpc_port_parcel_read_int32(parcel, &seq_id);
   rpc_port_parcel_read_bool(parcel, &once);
   _W("id(%d), seq_id(%d)", id, seq_id);
 
-  if (id > 0 && id < ARRAY_SIZE(__<PREFIX>_<NAME>_delegate_table)) {
+  if (id > 0 && id < table_size) {
     if (__<PREFIX>_<NAME>_delegate_table[id])
       __<PREFIX>_<NAME>_delegate_table[id](delegates, parcel, id, seq_id);
   } else {

diff --git a/idlc/gen/c_stub_body_gen_cb.h b/idlc/gen/c_stub_body_gen_cb.h
index aafe2f1ca33f6083c2ba4a650232a1d1aa7f8cd6..c1214fcc9ded425f7847e6c373a2675a09d584b8 100644 (file)
--- a/idlc/gen/c_stub_body_gen_cb.h
+++ b/idlc/gen/c_stub_body_gen_cb.h
@@ -149,9 +149,10 @@ static int __<PREFIX>_<NAME>_context_handle_request(<PREFIX>_<NAME>_context_h h,
 {
   int ret = RPC_PORT_ERROR_NONE;
   int cmd = -1;
+  static const int table_size = ARRAY_SIZE(__<NAME>_method_table);
 
   rpc_port_parcel_read_int32(parcel, &cmd);
-  if (cmd > 1 && cmd < ARRAY_SIZE(__<NAME>_method_table)) {
+  if (cmd > 1 && cmd < table_size) {
     if (__<NAME>_method_table[cmd])
       ret = __<NAME>_method_table[cmd](h->port, parcel, h);
   } else {

diff --git a/idlc/gen_cion/c_cion_group_body_gen_cb.h b/idlc/gen_cion/c_cion_group_body_gen_cb.h
index b48ccc14aa16f054afba20241875c6a1c9c80f6f..f3aeb90dde85bb25609963838632ec40e85973c9 100644 (file)
--- a/idlc/gen_cion/c_cion_group_body_gen_cb.h
+++ b/idlc/gen_cion/c_cion_group_body_gen_cb.h
@@ -137,9 +137,10 @@ static int __<PREFIX>_<NAME>_process_received_event(<PREFIX>_<NAME>_t *h, const
 {
   int ret = <ERROR_PREFIX>_ERROR_NONE;
   int cmd = -1;
+  static const int table_size = ARRAY_SIZE(__<NAME>_method_table);
 
   rpc_port_parcel_read_int32(parcel, &cmd);
-  if (cmd >= 0 && cmd < ARRAY_SIZE(__<NAME>_method_table)) {
+  if (cmd >= 0 && cmd < table_size) {
     if (__<NAME>_method_table[cmd])
       ret = __<NAME>_method_table[cmd](peer_info, parcel, h);
   } else {

diff --git a/idlc/gen_cion/c_cion_proxy_body_gen_cb.h b/idlc/gen_cion/c_cion_proxy_body_gen_cb.h
index 68513c74808a145b9678cac10688c2943c882781..c3dd4441e5f7b572426a727aef72c193edef7bb3 100644 (file)
--- a/idlc/gen_cion/c_cion_proxy_body_gen_cb.h
+++ b/idlc/gen_cion/c_cion_proxy_body_gen_cb.h
@@ -473,13 +473,14 @@ static void __<PREFIX>_<NAME>_process_received_event(GList **delegates, rpc_port
   int id = 0;
   int seq_id = 0;
   bool once = false;
+  static const int table_size = ARRAY_SIZE(__<PREFIX>_<NAME>_delegate_table);
 
   rpc_port_parcel_read_int32(parcel, &id);
   rpc_port_parcel_read_int32(parcel, &seq_id);
   rpc_port_parcel_read_bool(parcel, &once);
   _W("id(%d), seq_id(%d)", id, seq_id);
 
-  if (id > 0 && id < ARRAY_SIZE(__<PREFIX>_<NAME>_delegate_table)) {
+  if (id > 0 && id < table_size) {
     if (__<PREFIX>_<NAME>_delegate_table[id])
       __<PREFIX>_<NAME>_delegate_table[id](delegates, parcel, id, seq_id);
   } else {

diff --git a/idlc/gen_cion/c_cion_stub_body_gen_cb.h b/idlc/gen_cion/c_cion_stub_body_gen_cb.h
index 06082d73d47c0f26c5e3bac9f3eebe487bb7c7af..b16e7cfb232ea267f2e4d7d031f840848e145f5c 100644 (file)
--- a/idlc/gen_cion/c_cion_stub_body_gen_cb.h
+++ b/idlc/gen_cion/c_cion_stub_body_gen_cb.h
@@ -119,9 +119,10 @@ static int __<PREFIX>_<NAME>_process_received_event(<PREFIX>_<NAME>_t *h, const
 {
   int ret = <ERROR_PREFIX>_ERROR_NONE;
   int cmd = -1;
+  static const int table_size = ARRAY_SIZE(__<NAME>_method_table);
 
   rpc_port_parcel_read_int32(parcel, &cmd);
-  if (cmd > 1 && cmd < ARRAY_SIZE(__<NAME>_method_table)) {
+  if (cmd > 1 && cmd < table_size) {
     if (__<NAME>_method_table[cmd])
       ret = __<NAME>_method_table[cmd](peer_info, parcel, return_parcel, h);
   } else {