Merge pull request #86 from Pairarma/master

Fix warnings

Author: tianyuan129

app-support/access-control.c

@@ -137,6 +137,7 @@ _ac_timeout()
 int
 _on_ac_notification(const uint8_t* interest, uint32_t interest_size, void* userdata)
 {
+  (void) userdata;
   ndn_interest_t notification;
   ndn_interest_from_block(&notification, interest, interest_size);
   // /[home-prefix]/NDN_SD_AC/NOTIFY/[service-id]/keyid
@@ -171,6 +172,7 @@ _on_ac_notification(const uint8_t* interest, uint32_t interest_size, void* userd
 void
 _on_ekey_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
 {
+  (void) userdata;
   // parse Data
   ndn_data_t data;
   int ret = -1;
@@ -270,6 +272,7 @@ _on_ekey_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
 void
 _on_dkey_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
 {
+  (void) userdata;
   // parse Data
   ndn_data_t data;
   int ret = -1;

app-support/ndn-sig-verifier.c

@@ -118,6 +118,7 @@ sig_verifier_on_timeout(void* userdata)
 int
 sig_verifier_on_interest(const uint8_t* raw_int, uint32_t raw_int_size, void* userdata)
 {
+  (void) userdata;
   ndn_interest_t interest;
   ndn_interest_from_block(&interest, raw_int, raw_int_size);
   NDN_LOG_DEBUG("[SIGVERIFIER] SigVerifier received certificate fetching Interest: ");

app-support/pub-sub.c

@@ -175,6 +175,7 @@ _match_pub_topic(uint8_t service, bool is_cmd)
 void
 _on_sub_timeout(void* userdata)
 {
+  (void) userdata;
   NDN_LOG_INFO("[PUB/SUB] Subscription Interest Timeout");
 }
 
@@ -293,6 +294,7 @@ _on_new_content_verify_success(ndn_data_t* data, void* userdata)
 void
 _on_new_content_verify_failure(ndn_data_t* data, void* userdata)
 {
+  (void) userdata;
   NDN_LOG_INFO("[PUB/SUB] New published content cannot pass signature verification. Drop...");
   NDN_LOG_INFO_NAME(&data->name);
 }

app-support/security-bootstrapping.c

@@ -112,6 +112,7 @@ on_sec_boot_sign_on_interest_timeout (void* userdata)
 void
 on_cert_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
 {
+  (void) userdata;
   // parse received data
   ndn_data_t data;
   if (ndn_data_tlv_decode_hmac_verify(&data, raw_data, data_size, m_sec_boot_state.pre_shared_hmac_key) != NDN_SUCCESS) {
@@ -300,6 +301,7 @@ sec_boot_send_cert_interest()
 void
 on_sign_on_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
 {
+  (void) userdata;
   // parse received data
   ndn_data_t data;
   if (ndn_data_tlv_decode_hmac_verify(&data, raw_data, data_size, m_sec_boot_state.pre_shared_hmac_key) != NDN_SUCCESS) {

app-support/service-discovery.c

@@ -350,6 +350,7 @@ sd_add_interested_service(uint8_t service_id)
 int
 _on_sd_interest(const uint8_t* raw_int, uint32_t raw_int_size, void* userdata)
 {
+  (void) userdata;
   if (m_is_my_own_sd_int) {
     return NDN_FWD_STRATEGY_MULTICAST;
   }
@@ -460,6 +461,7 @@ _on_sd_interest(const uint8_t* raw_int, uint32_t raw_int_size, void* userdata)
 void
 _on_query_or_sd_meta_data(const uint8_t* raw_data, uint32_t data_size, void* userdata)
 {
+  (void) userdata;
   ndn_data_t data;
   if (ndn_data_tlv_decode_digest_verify(&data, raw_data, data_size)) {
     NDN_LOG_ERROR("Decoding failed.\n");

encode/name.c

@@ -249,7 +249,7 @@ ndn_name_compare_block(const uint8_t* lhs_block_value, uint32_t lhs_block_size,
   ndn_decoder_t lhs_decoder, rhs_decoder;
   decoder_init(&lhs_decoder, lhs_block_value, lhs_block_size);
   decoder_init(&rhs_decoder, rhs_block_value, rhs_block_size);
-  uint32_t probe, retval = 0;
+  uint32_t probe = 0, retval = 0;
 
   /* check left name type */
   decoder_get_type(&lhs_decoder, &probe);

forwarder/pit.c

@@ -28,6 +28,7 @@ ndn_pit_entry_reset(ndn_pit_entry_t* self){
 }
 
 static void ndn_pit_timeout(void *selfptr, size_t param_len, void *param){
+  (void) param_len, (void) param;
   ndn_pit_t* self = (ndn_pit_t*)selfptr;
   ndn_table_id_t i;
   ndn_time_ms_t now = ndn_time_now_ms();

ndn-error-code.h

@@ -102,6 +102,7 @@
 #define NDN_SEC_INIT_FAILURE -28
 #define NDN_SEC_FAIL_VERIFY_SIG -29
 #define NDN_SEC_SIGNED_INTEREST_INVALID_DIGEST -30
+#define NDN_SEC_WRONG_INPUT_SIZE -31
 /* @} */
 
 /** @defgroup NDNErrorCodeFragmentation Fragmentation Errors

security/default-backend/ndn-lite-default-ecc-impl.c

@@ -147,6 +147,8 @@ ndn_lite_default_ecdsa_verify(const uint8_t* input_value, uint32_t input_size,
     return NDN_SEC_WRONG_KEY_SIZE;
   if (ecdsa_type != NDN_ECDSA_CURVE_SECP256R1)
     return NDN_SEC_UNSUPPORT_CRYPTO_ALGO;
+  if (input_size == 0)
+    return NDN_SEC_WRONG_INPUT_SIZE;
 
   uint8_t raw_sig_temp_buf[NDN_SEC_ECC_SECP256R1_PUBLIC_KEY_SIZE];
   uint32_t decoded_raw_signature_size;
@@ -176,6 +178,8 @@ ndn_lite_default_ecdsa_sign(const uint8_t* input_value, uint32_t input_size,
     return NDN_SEC_WRONG_KEY_SIZE;
   if (ecdsa_type != NDN_ECDSA_CURVE_SECP256R1)
     return NDN_SEC_UNSUPPORT_CRYPTO_ALGO;
+  if (input_size == 0)
+    return NDN_SEC_WRONG_INPUT_SIZE;
 
   uint32_t signature_size = NDN_SEC_ECC_SECP256R1_PUBLIC_KEY_SIZE;
   int ecc_sign_result = 0;

security/default-backend/ndn-lite-default-rng-impl.c

@@ -8,14 +8,17 @@
  * See AUTHORS.md for complete list of NDN-LITE authors and contributors.
  */
 
+#include <stddef.h>
 #include "ndn-lite-default-rng-impl.h"
 #include "../ndn-lite-rng.h"
 #include "../../ndn-error-code.h"
 
 /* always fails and return 0 */
 static int ndn_lite_default_rng(uint8_t *dest, unsigned size)
 {
-    return 0;
+  (void) dest, (void) size;
+
+  return 0;
 }
 
 void

tests/CMakeLists.txt

@@ -11,7 +11,7 @@ if (NOT CMAKE_BUILD_TYPE)
 endif()
 
 add_definitions(-D_GNU_SOURCE)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Werror -Wno-format -Wno-int-to-void-pointer-cast -Wno-int-to-pointer-cast")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Werror -Wno-format -Wno-int-to-pointer-cast -Wunused-parameter -Wunused-variable")
 set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb")
 set(CMAKE_C_FLAGS_RELEASE "-O3")
 

tests/unit-tests/forwarder-with-fragmentation-support/forwarder-fragmentation-tests.c

@@ -54,6 +54,7 @@ static bool ff_forwarder_put_data_received = false;
 
 void ff_on_data_callback(const uint8_t *data, uint32_t data_size, void *userdata)
 {
+  (void) userdata;
   ndn_data_t data_check;
   ndn_ecc_pub_t pub_key;
   int result = ndn_ecc_pub_init(&pub_key, test_ecc_secp256r1_public_raw_1, sizeof(test_ecc_secp256r1_public_raw_1),

tests/unit-tests/forwarder/forwarder-tests.c

@@ -47,6 +47,7 @@ int test_sign_data(const char* id, uint32_t id_len, ndn_encoder_t* encoder, ndn_
 
 void on_data_callback(const uint8_t *data, uint32_t data_size, void *userdata)
 {
+  (void) userdata;
   //printf("application receives a Data\n");
   ndn_data_t data_check;
   ndn_ecc_pub_t pub_key;
@@ -376,6 +377,7 @@ static bool forwarder_put_data_received = false;
 
 void on_data_callback2(const uint8_t *data, uint32_t data_size, void *userdata)
 {
+  (void) userdata;
   ndn_data_t data_check;
   ndn_ecc_pub_t pub_key;
   int result = ndn_ecc_pub_init(&pub_key, _forwarder_test_raw_pub_key_arr, _forwarder_test_raw_pub_key_arr_len,

tests/unit-tests/util/util-tests.c

@@ -90,10 +90,12 @@ void msgproc(void *self, size_t param_length, void *param) {
 }
 
 void dummy_msgproc(void *self, size_t param_length, void *param){
+  (void) self, (void) param_length, (void) param;
   ret = true;
 }
 
 void add_msgproc(void *self, size_t param_length, void *param){
+  (void) param_length;
   ulret += *(uint32_t*)param;
   ndn_msgqueue_post(self, add_msgproc, sizeof(uint32_t), &ulret);
 }