laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29975 )
Change subject: Support building with -Werror=strict-prototypes / -Werror=old-style-definition ......................................................................
Support building with -Werror=strict-prototypes / -Werror=old-style-definition
Unfortunately "-std=c99" is not sufficient to make gcc ignore cold that uses constructs of earlier C standards, which were abandoned in C99.
See https://lwn.net/ml/fedora-devel/Y1kvF35WozzGBpc8@redhat.com/ for some related discussion.
Change-Id: I84fd99442d0cc400fa562fa33623c142649230e2 --- M include/osmocom/core/counter.h M include/osmocom/core/select.h M include/osmocom/gprs/gprs_bssgp.h M include/osmocom/gsm/gsm0808.h M include/osmocom/vty/command.h M include/osmocom/vty/logging.h M src/counter.c M src/gb/gprs_bssgp.c M src/gsm/gsm0808.c M src/select.c M src/vty/cpu_sched_vty.c M src/vty/logging_vty.c M src/vty/stats_vty.c M utils/osmo-aka-verify.c M utils/osmo-auc-gen.c 15 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/29975/1
diff --git a/include/osmocom/core/counter.h b/include/osmocom/core/counter.h index 0d56bc4..7b677cb 100644 --- a/include/osmocom/core/counter.h +++ b/include/osmocom/core/counter.h @@ -52,7 +52,7 @@
int osmo_counters_for_each(int (*handle_counter)(struct osmo_counter *, void *), void *data);
-int osmo_counters_count(); +int osmo_counters_count(void);
struct osmo_counter *osmo_counter_get_by_name(const char *name);
diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h index e9f19a5..fc14851 100644 --- a/include/osmocom/core/select.h +++ b/include/osmocom/core/select.h @@ -105,8 +105,8 @@ struct osmo_signalfd * osmo_signalfd_setup(void *ctx, sigset_t set, osmo_signalfd_cb *cb, void *data);
-void osmo_select_shutdown_request(); -int osmo_select_shutdown_requested(); -bool osmo_select_shutdown_done(); +void osmo_select_shutdown_request(void); +int osmo_select_shutdown_requested(void); +bool osmo_select_shutdown_done(void);
/*! @} */ diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h index 09f640d..6c04332 100644 --- a/include/osmocom/gprs/gprs_bssgp.h +++ b/include/osmocom/gprs/gprs_bssgp.h @@ -235,7 +235,7 @@ int bssgp_fc_ms_init(struct bssgp_flow_control *fc_ms, uint16_t bvci, uint16_t nsei, uint32_t max_queue_depth);
-void bssgp_flush_all_queues(); +void bssgp_flush_all_queues(void); void bssgp_fc_flush_queue(struct bssgp_flow_control *fc);
/* gprs_bssgp_vty.c */ diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index b4c7803..dcff415 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -73,7 +73,7 @@ struct msgb *gsm0808_create_cipher_complete(struct msgb *layer3, uint8_t alg_id); struct msgb *gsm0808_create_cipher_reject(enum gsm0808_cause cause); struct msgb *gsm0808_create_cipher_reject_ext(enum gsm0808_cause_class class, uint8_t ext); -struct msgb *gsm0808_create_classmark_request(); +struct msgb *gsm0808_create_classmark_request(void); struct msgb *gsm0808_create_classmark_update(const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); struct msgb *gsm0808_create_sapi_reject_cause(uint8_t link_id, uint16_t cause); @@ -269,8 +269,8 @@ }; struct msgb *gsm0808_create_handover_command(const struct gsm0808_handover_command *params);
-struct msgb *gsm0808_create_handover_detect(); -struct msgb *gsm0808_create_handover_succeeded(); +struct msgb *gsm0808_create_handover_detect(void); +struct msgb *gsm0808_create_handover_succeeded(void);
struct gsm0808_handover_complete { bool rr_cause_present; diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index e3919fb..57fbe0e 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -442,8 +442,8 @@ vector cmd_make_strvec(const char *); int cmd_make_strvec2(const char *string, char **indent, vector *strvec_p); void cmd_free_strvec(vector); -vector cmd_describe_command(); -char **cmd_complete_command(); +vector cmd_describe_command(vector vline, struct vty * vty, int *status); +char **cmd_complete_command(vector vline, struct vty *vty, int *status); const char *cmd_prompt(enum node_type); int config_from_file(struct vty *, FILE *); enum node_type node_parent(enum node_type); diff --git a/include/osmocom/vty/logging.h b/include/osmocom/vty/logging.h index 90c8fa1..0ea6432 100644 --- a/include/osmocom/vty/logging.h +++ b/include/osmocom/vty/logging.h @@ -6,7 +6,7 @@ #define FILTER_STR "Filter log messages\n"
struct log_info; -void logging_vty_add_cmds(); +void logging_vty_add_cmds(void); void logging_vty_add_deprecated_subsys(void *ctx, const char *name); struct vty; struct log_target *osmo_log_vty2tgt(struct vty *vty); diff --git a/src/counter.c b/src/counter.c index cbee7b9..dace15f 100644 --- a/src/counter.c +++ b/src/counter.c @@ -75,7 +75,7 @@
/*! Counts the registered counter * \returns amount of counters */ -int osmo_counters_count() +int osmo_counters_count(void) { return llist_count(&counters); } diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index c967f73..7abef80 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -1428,7 +1428,7 @@ /*! * \brief Flush the queues of all BSSGP contexts. */ -void bssgp_flush_all_queues() +void bssgp_flush_all_queues(void) { struct bssgp_bvc_ctx *bctx;
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e057832..89a8874 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -418,7 +418,7 @@
/*! Create BSSMAP Classmark Request message * \returns callee-allocated msgb with BSSMAP Classmark Request message */ -struct msgb *gsm0808_create_classmark_request() +struct msgb *gsm0808_create_classmark_request(void) { struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "classmark-request"); @@ -1110,7 +1110,7 @@ /*! Create BSSMAP HANDOVER DETECT message, 3GPP TS 48.008 3.2.1.40. * Sent from the MT BSC back to the MSC when the MS has sent a handover RACH request and the MT BSC has * received the Handover Detect message. */ -struct msgb *gsm0808_create_handover_detect() +struct msgb *gsm0808_create_handover_detect(void) { struct msgb *msg;
@@ -1129,7 +1129,7 @@
/*! Create BSSMAP HANDOVER SUCCEEDED message, 3GPP TS 48.008 3.2.1.13. * Sent from the MSC back to the old BSS to notify that the MS has successfully accessed the new BSS. */ -struct msgb *gsm0808_create_handover_succeeded() +struct msgb *gsm0808_create_handover_succeeded(void) { struct msgb *msg;
diff --git a/src/select.c b/src/select.c index 735ea3e..5aee7d8 100644 --- a/src/select.c +++ b/src/select.c @@ -653,20 +653,20 @@ * } * } */ -void osmo_select_shutdown_request() +void osmo_select_shutdown_request(void) { _osmo_select_shutdown_requested++; };
/*! Return the number of times osmo_select_shutdown_request() was called before. */ -int osmo_select_shutdown_requested() +int osmo_select_shutdown_requested(void) { return _osmo_select_shutdown_requested; };
/*! Return true after osmo_select_shutdown_requested() was called, and after an osmo_select poll loop found no more * pending OSMO_FD_WRITE on any registered socket. */ -bool osmo_select_shutdown_done() { +bool osmo_select_shutdown_done(void) { return _osmo_select_shutdown_done; };
diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index dbb3cd5..301e7a6 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -89,7 +89,7 @@ };
/* returns number of configured CPUs in the system, or negative otherwise */ -static int get_num_cpus() { +static int get_num_cpus(void) { static unsigned int num_cpus = 0; long ln;
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index c83dafd..59c8a9c 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -1196,7 +1196,7 @@
/*! Register logging related commands to the VTY. Call this once from * your application if you want to support those commands. */ -void logging_vty_add_cmds() +void logging_vty_add_cmds(void) { install_lib_element_ve(&enable_logging_cmd); install_lib_element_ve(&disable_logging_cmd); diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index e5acfa2..299ec24 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -742,7 +742,7 @@ * Call this once during your application initialization if you would * like to have stats VTY commands enabled. */ -void osmo_stats_vty_add_cmds() +void osmo_stats_vty_add_cmds(void) { install_lib_element_ve(&show_stats_cmd); install_lib_element_ve(&show_stats_level_cmd); diff --git a/utils/osmo-aka-verify.c b/utils/osmo-aka-verify.c index bbc65ef..f23c349 100644 --- a/utils/osmo-aka-verify.c +++ b/utils/osmo-aka-verify.c @@ -88,7 +88,7 @@ }
-static void help() +static void help(void) { printf( "Static SIM card parameters:\n" "-k --key\tSpecify Ki / K\n" diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index 72f1fcd..e3e1b43 100644 --- a/utils/osmo-auc-gen.c +++ b/utils/osmo-auc-gen.c @@ -85,7 +85,7 @@ .algo = OSMO_AUTH_ALG_NONE, };
-static void help() +static void help(void) { int alg; printf( "-2 --2g\tUse 2G (GSM) authentication\n"