[PATCH 00/16] M15 coding style fixes

[PATCH 00/16] M15 coding style fixes

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 5292 bytes --]

Hi,

 Coding style fix patches for the whole oFono tree.

Regards,
Jeevaka

Jeevaka Badrappan (16):
  smsutil: M15 coding style fix
  core: M15 coding style fix
  include: M15 coding style fix
  mbmmodem: M15 coding style fix
  hfpmodem: M15 coding style fix
  huaweimodem: M15 coding style fix
  stemodem: M15 coding style fix
  calypsomodem: M15 coding style fix
  ifxmodem: M15 coding style fix
  hsomodem: M15 coding style fix
  nwmodem: M15 coding style fix
  isimodem: M15 coding style fix
  atmodem: M15 coding style fix
  plugins: M15 coding style fix
  unit: M15 coding style fix
  gatchat: M15 coding styles fixes

 drivers/atmodem/atmodem.h               |   68 +++++++++++++++---------------
 drivers/atmodem/call-barring.c          |    4 +-
 drivers/atmodem/call-forwarding.c       |    4 +-
 drivers/atmodem/call-meter.c            |    4 +-
 drivers/atmodem/call-settings.c         |    4 +-
 drivers/atmodem/call-volume.c           |    4 +-
 drivers/atmodem/cbs.c                   |    4 +-
 drivers/atmodem/gprs-context.c          |    4 +-
 drivers/atmodem/gprs.c                  |    4 +-
 drivers/atmodem/network-registration.c  |    4 +-
 drivers/atmodem/phonebook.c             |    6 +-
 drivers/atmodem/sim.c                   |    4 +-
 drivers/atmodem/sms.c                   |    4 +-
 drivers/atmodem/ssn.c                   |    4 +-
 drivers/atmodem/stk.c                   |    4 +-
 drivers/atmodem/ussd.c                  |    4 +-
 drivers/atmodem/voicecall.c             |    4 +-
 drivers/calypsomodem/calypsomodem.h     |    8 ++--
 drivers/calypsomodem/stk.c              |    4 +-
 drivers/calypsomodem/voicecall.c        |    4 +-
 drivers/hfpmodem/call-volume.c          |    4 +-
 drivers/hfpmodem/hfpmodem.h             |   12 +++---
 drivers/hfpmodem/network-registration.c |    4 +-
 drivers/hfpmodem/voicecall.c            |    4 +-
 drivers/hsomodem/gprs-context.c         |    4 +-
 drivers/hsomodem/hsomodem.h             |    8 ++--
 drivers/hsomodem/radio-settings.c       |    4 +-
 drivers/huaweimodem/audio-settings.c    |    4 +-
 drivers/huaweimodem/gprs-context.c      |    4 +-
 drivers/huaweimodem/huaweimodem.h       |   16 ++++----
 drivers/huaweimodem/radio-settings.c    |    4 +-
 drivers/huaweimodem/voicecall.c         |    4 +-
 drivers/ifxmodem/audio-settings.c       |    4 +-
 drivers/ifxmodem/gprs-context.c         |    4 +-
 drivers/ifxmodem/ifxmodem.h             |   20 +++++-----
 drivers/ifxmodem/radio-settings.c       |    4 +-
 drivers/ifxmodem/stk.c                  |    4 +-
 drivers/ifxmodem/voicecall.c            |    4 +-
 drivers/isimodem/audio-settings.c       |    4 +-
 drivers/isimodem/call-barring.c         |    4 +-
 drivers/isimodem/call-forwarding.c      |    4 +-
 drivers/isimodem/call-meter.c           |    4 +-
 drivers/isimodem/call-settings.c        |    4 +-
 drivers/isimodem/cbs.c                  |    4 +-
 drivers/isimodem/devinfo.c              |    4 +-
 drivers/isimodem/gprs-context.c         |    4 +-
 drivers/isimodem/isimodem.h             |   68 +++++++++++++++---------------
 drivers/isimodem/network-registration.c |    4 +-
 drivers/isimodem/phonebook.c            |    4 +-
 drivers/isimodem/radio-settings.c       |    4 +-
 drivers/isimodem/sim.c                  |    4 +-
 drivers/isimodem/sms.c                  |    4 +-
 drivers/isimodem/ssn.c                  |    4 +-
 drivers/isimodem/ussd.c                 |    4 +-
 drivers/isimodem/voicecall.c            |    4 +-
 drivers/mbmmodem/gprs-context.c         |    4 +-
 drivers/mbmmodem/mbmmodem.h             |    8 ++--
 drivers/mbmmodem/stk.c                  |    4 +-
 drivers/nwmodem/nwmodem.h               |    4 +-
 drivers/nwmodem/radio-settings.c        |    4 +-
 drivers/stemodem/gprs-context.c         |    4 +-
 drivers/stemodem/radio-settings.c       |    4 +-
 drivers/stemodem/stemodem.h             |   12 +++---
 drivers/stemodem/voicecall.c            |    4 +-
 gatchat/gatsyntax.c                     |    4 +-
 gatchat/gatsyntax.h                     |    4 +-
 gatchat/gsmdial.c                       |    4 +-
 gatchat/test-server.c                   |    4 +-
 include/dbus.h                          |    2 +-
 plugins/bluetooth.h                     |    2 +-
 plugins/hfp.c                           |    6 +-
 plugins/push-notification.c             |    4 +-
 plugins/smart-messaging.c               |    4 +-
 src/dbus.c                              |    2 +-
 src/main.c                              |    2 +-
 src/manager.c                           |    4 +-
 src/modem.c                             |    6 +-
 src/ofono.h                             |   12 +++---
 src/smsutil.c                           |    2 +-
 src/smsutil.h                           |    2 +-
 unit/test-common.c                      |    6 +-
 unit/test-idmap.c                       |    4 +-
 unit/test-mux.c                         |    8 ++--
 unit/test-simutil.c                     |   14 +++---
 unit/test-sms.c                         |   26 ++++++------
 unit/test-util.c                        |   20 +++++-----
 86 files changed, 292 insertions(+), 292 deletions(-)

[PATCH 01/16] smsutil: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]

---
 src/smsutil.c |    2 +-
 src/smsutil.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/smsutil.c b/src/smsutil.c
index 5e1d233..3a54fe6 100644
--- a/src/smsutil.c
+++ b/src/smsutil.c
@@ -3902,7 +3902,7 @@ static inline gboolean cbs_is_update_newer(unsigned int n, unsigned int o)
 	return FALSE;
 }
 
-struct cbs_assembly *cbs_assembly_new()
+struct cbs_assembly *cbs_assembly_new(void)
 {
 	return g_new0(struct cbs_assembly, 1);
 }
diff --git a/src/smsutil.h b/src/smsutil.h
index 4b6159f..dd65884 100644
--- a/src/smsutil.h
+++ b/src/smsutil.h
@@ -540,7 +540,7 @@ gboolean cbs_extract_app_port(const struct cbs *cbs, int *dst, int *src,
 
 char *cbs_decode_text(GSList *cbs_list, char *iso639_lang);
 
-struct cbs_assembly *cbs_assembly_new();
+struct cbs_assembly *cbs_assembly_new(void);
 void cbs_assembly_free(struct cbs_assembly *assembly);
 GSList *cbs_assembly_add_page(struct cbs_assembly *assembly,
 				const struct cbs *cbs);
-- 
1.7.0.4

[PATCH 02/16] core: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 2984 bytes --]

---
 src/dbus.c    |    2 +-
 src/main.c    |    2 +-
 src/manager.c |    4 ++--
 src/modem.c   |    6 +++---
 src/ofono.h   |   12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/dbus.c b/src/dbus.c
index b719217..01d43cf 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -415,7 +415,7 @@ gboolean __ofono_dbus_valid_object_path(const char *path)
 	return TRUE;
 }
 
-DBusConnection *ofono_dbus_get_connection()
+DBusConnection *ofono_dbus_get_connection(void)
 {
 	return g_connection;
 }
diff --git a/src/main.c b/src/main.c
index 87fb0ab..3db8819 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,7 +42,7 @@
 
 static GMainLoop *event_loop;
 
-void __ofono_exit()
+void __ofono_exit(void)
 {
 	g_main_loop_quit(event_loop);
 }
diff --git a/src/manager.c b/src/manager.c
index 0649bcc..7075909 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -91,7 +91,7 @@ static GDBusSignalTable manager_signals[] = {
 	{ }
 };
 
-int __ofono_manager_init()
+int __ofono_manager_init(void)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
 	gboolean ret;
@@ -107,7 +107,7 @@ int __ofono_manager_init()
 	return 0;
 }
 
-void __ofono_manager_cleanup()
+void __ofono_manager_cleanup(void)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
 
diff --git a/src/modem.c b/src/modem.c
index 953d6c3..981aabc 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -1560,12 +1560,12 @@ static void sim_watch(struct ofono_atom *atom,
 							modem, NULL);
 }
 
-void __ofono_modemwatch_init()
+void __ofono_modemwatch_init(void)
 {
 	g_modemwatches = __ofono_watchlist_new(g_free);
 }
 
-void __ofono_modemwatch_cleanup()
+void __ofono_modemwatch_cleanup(void)
 {
 	__ofono_watchlist_free(g_modemwatches);
 }
@@ -1850,7 +1850,7 @@ void ofono_modem_driver_unregister(const struct ofono_modem_driver *d)
 	}
 }
 
-void __ofono_modem_shutdown()
+void __ofono_modem_shutdown(void)
 {
 	struct ofono_modem *modem;
 	GSList *l;
diff --git a/src/ofono.h b/src/ofono.h
index cab70cd..77567c2 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -25,12 +25,12 @@
 
 #include <ofono/types.h>
 
-void __ofono_exit();
+void __ofono_exit(void);
 
-int __ofono_manager_init();
-void __ofono_manager_cleanup();
+int __ofono_manager_init(void);
+void __ofono_manager_cleanup(void);
 
-void __ofono_modem_shutdown();
+void __ofono_modem_shutdown(void);
 
 #include <ofono/log.h>
 
@@ -174,8 +174,8 @@ void __ofono_atom_free(struct ofono_atom *atom);
 
 typedef void (*ofono_modemwatch_cb_t)(struct ofono_modem *modem,
 					gboolean added, void *data);
-void __ofono_modemwatch_init();
-void __ofono_modemwatch_cleanup();
+void __ofono_modemwatch_init(void);
+void __ofono_modemwatch_cleanup(void);
 unsigned int __ofono_modemwatch_add(ofono_modemwatch_cb_t cb, void *user,
 					ofono_destroy_func destroy);
 gboolean __ofono_modemwatch_remove(unsigned int id);
-- 
1.7.0.4

[PATCH 03/16] include: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

---
 include/dbus.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/dbus.h b/include/dbus.h
index 12768f6..f541eaf 100644
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -65,7 +65,7 @@ extern "C" {
 					DBUS_TYPE_VARIANT_AS_STRING \
 					DBUS_DICT_ENTRY_END_CHAR_AS_STRING
 
-DBusConnection *ofono_dbus_get_connection();
+DBusConnection *ofono_dbus_get_connection(void);
 
 void ofono_dbus_dict_append(DBusMessageIter *dict, const char *key, int type,
 				void *value);
-- 
1.7.0.4

[PATCH 04/16] mbmmodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 1793 bytes --]

---
 drivers/mbmmodem/gprs-context.c |    4 ++--
 drivers/mbmmodem/mbmmodem.h     |    8 ++++----
 drivers/mbmmodem/stk.c          |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c
index 0a1ca2c..b9b4574 100644
--- a/drivers/mbmmodem/gprs-context.c
+++ b/drivers/mbmmodem/gprs-context.c
@@ -514,12 +514,12 @@ static struct ofono_gprs_context_driver driver = {
 	.deactivate_primary	= mbm_gprs_deactivate_primary,
 };
 
-void mbm_gprs_context_init()
+void mbm_gprs_context_init(void)
 {
 	ofono_gprs_context_driver_register(&driver);
 }
 
-void mbm_gprs_context_exit()
+void mbm_gprs_context_exit(void)
 {
 	ofono_gprs_context_driver_unregister(&driver);
 }
diff --git a/drivers/mbmmodem/mbmmodem.h b/drivers/mbmmodem/mbmmodem.h
index 65786d7..4c6f263 100644
--- a/drivers/mbmmodem/mbmmodem.h
+++ b/drivers/mbmmodem/mbmmodem.h
@@ -21,8 +21,8 @@
 
 #include <drivers/atmodem/atutil.h>
 
-extern void mbm_gprs_context_init();
-extern void mbm_gprs_context_exit();
+extern void mbm_gprs_context_init(void);
+extern void mbm_gprs_context_exit(void);
 
-extern void mbm_stk_init();
-extern void mbm_stk_exit();
+extern void mbm_stk_init(void);
+extern void mbm_stk_exit(void);
diff --git a/drivers/mbmmodem/stk.c b/drivers/mbmmodem/stk.c
index 81c36db..d0a9f3b 100644
--- a/drivers/mbmmodem/stk.c
+++ b/drivers/mbmmodem/stk.c
@@ -270,12 +270,12 @@ static struct ofono_stk_driver driver = {
 	.terminal_response	= mbm_stk_terminal_response,
 };
 
-void mbm_stk_init()
+void mbm_stk_init(void)
 {
 	ofono_stk_driver_register(&driver);
 }
 
-void mbm_stk_exit()
+void mbm_stk_exit(void)
 {
 	ofono_stk_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 05/16] hfpmodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 2605 bytes --]

---
 drivers/hfpmodem/call-volume.c          |    4 ++--
 drivers/hfpmodem/hfpmodem.h             |   12 ++++++------
 drivers/hfpmodem/network-registration.c |    4 ++--
 drivers/hfpmodem/voicecall.c            |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/hfpmodem/call-volume.c b/drivers/hfpmodem/call-volume.c
index f985175..19f57c4 100644
--- a/drivers/hfpmodem/call-volume.c
+++ b/drivers/hfpmodem/call-volume.c
@@ -226,12 +226,12 @@ static struct ofono_call_volume_driver driver = {
 	.mute			= NULL,
 };
 
-void hfp_call_volume_init()
+void hfp_call_volume_init(void)
 {
 	ofono_call_volume_driver_register(&driver);
 }
 
-void hfp_call_volume_exit()
+void hfp_call_volume_exit(void)
 {
 	ofono_call_volume_driver_unregister(&driver);
 }
diff --git a/drivers/hfpmodem/hfpmodem.h b/drivers/hfpmodem/hfpmodem.h
index bf5d563..fca1a9b 100644
--- a/drivers/hfpmodem/hfpmodem.h
+++ b/drivers/hfpmodem/hfpmodem.h
@@ -72,11 +72,11 @@ struct hfp_data {
 	gboolean agent_registered;
 };
 
-extern void hfp_netreg_init();
-extern void hfp_netreg_exit();
+extern void hfp_netreg_init(void);
+extern void hfp_netreg_exit(void);
 
-extern void hfp_call_volume_init();
-extern void hfp_call_volume_exit();
+extern void hfp_call_volume_init(void);
+extern void hfp_call_volume_exit(void);
 
-extern void hfp_voicecall_init();
-extern void hfp_voicecall_exit();
+extern void hfp_voicecall_init(void);
+extern void hfp_voicecall_exit(void);
diff --git a/drivers/hfpmodem/network-registration.c b/drivers/hfpmodem/network-registration.c
index 03ddc7b..273490e 100644
--- a/drivers/hfpmodem/network-registration.c
+++ b/drivers/hfpmodem/network-registration.c
@@ -348,12 +348,12 @@ static struct ofono_netreg_driver driver = {
 	.strength			= hfp_signal_strength,
 };
 
-void hfp_netreg_init()
+void hfp_netreg_init(void)
 {
 	ofono_netreg_driver_register(&driver);
 }
 
-void hfp_netreg_exit()
+void hfp_netreg_exit(void)
 {
 	ofono_netreg_driver_unregister(&driver);
 }
diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
index 53ca4bd..4c8ee37 100644
--- a/drivers/hfpmodem/voicecall.c
+++ b/drivers/hfpmodem/voicecall.c
@@ -1174,12 +1174,12 @@ static struct ofono_voicecall_driver driver = {
 	.send_tones		= hfp_send_dtmf
 };
 
-void hfp_voicecall_init()
+void hfp_voicecall_init(void)
 {
 	ofono_voicecall_driver_register(&driver);
 }
 
-void hfp_voicecall_exit()
+void hfp_voicecall_exit(void)
 {
 	ofono_voicecall_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 06/16] huaweimodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 3704 bytes --]

---
 drivers/huaweimodem/audio-settings.c |    4 ++--
 drivers/huaweimodem/gprs-context.c   |    4 ++--
 drivers/huaweimodem/huaweimodem.h    |   16 ++++++++--------
 drivers/huaweimodem/radio-settings.c |    4 ++--
 drivers/huaweimodem/voicecall.c      |    4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/huaweimodem/audio-settings.c b/drivers/huaweimodem/audio-settings.c
index 305776f..46d4e44 100644
--- a/drivers/huaweimodem/audio-settings.c
+++ b/drivers/huaweimodem/audio-settings.c
@@ -119,12 +119,12 @@ static struct ofono_audio_settings_driver driver = {
 	.remove		= huawei_audio_settings_remove,
 };
 
-void huawei_audio_settings_init()
+void huawei_audio_settings_init(void)
 {
 	ofono_audio_settings_driver_register(&driver);
 }
 
-void huawei_audio_settings_exit()
+void huawei_audio_settings_exit(void)
 {
 	ofono_audio_settings_driver_unregister(&driver);
 }
diff --git a/drivers/huaweimodem/gprs-context.c b/drivers/huaweimodem/gprs-context.c
index ef3d93c..30f423b 100644
--- a/drivers/huaweimodem/gprs-context.c
+++ b/drivers/huaweimodem/gprs-context.c
@@ -406,12 +406,12 @@ static struct ofono_gprs_context_driver driver = {
 	.deactivate_primary	= huawei_gprs_deactivate_primary,
 };
 
-void huawei_gprs_context_init()
+void huawei_gprs_context_init(void)
 {
 	ofono_gprs_context_driver_register(&driver);
 }
 
-void huawei_gprs_context_exit()
+void huawei_gprs_context_exit(void)
 {
 	ofono_gprs_context_driver_unregister(&driver);
 }
diff --git a/drivers/huaweimodem/huaweimodem.h b/drivers/huaweimodem/huaweimodem.h
index 596aa08..f8323e3 100644
--- a/drivers/huaweimodem/huaweimodem.h
+++ b/drivers/huaweimodem/huaweimodem.h
@@ -21,14 +21,14 @@
 
 #include <drivers/atmodem/atutil.h>
 
-extern void huawei_voicecall_init();
-extern void huawei_voicecall_exit();
+extern void huawei_voicecall_init(void);
+extern void huawei_voicecall_exit(void);
 
-extern void huawei_audio_settings_init();
-extern void huawei_audio_settings_exit();
+extern void huawei_audio_settings_init(void);
+extern void huawei_audio_settings_exit(void);
 
-extern void huawei_radio_settings_init();
-extern void huawei_radio_settings_exit();
+extern void huawei_radio_settings_init(void);
+extern void huawei_radio_settings_exit(void);
 
-extern void huawei_gprs_context_init();
-extern void huawei_gprs_context_exit();
+extern void huawei_gprs_context_init(void);
+extern void huawei_gprs_context_exit(void);
diff --git a/drivers/huaweimodem/radio-settings.c b/drivers/huaweimodem/radio-settings.c
index bece2cd..68112fe 100644
--- a/drivers/huaweimodem/radio-settings.c
+++ b/drivers/huaweimodem/radio-settings.c
@@ -404,12 +404,12 @@ static struct ofono_radio_settings_driver driver = {
 	.set_band               = huawei_set_band,
 };
 
-void huawei_radio_settings_init()
+void huawei_radio_settings_init(void)
 {
 	ofono_radio_settings_driver_register(&driver);
 }
 
-void huawei_radio_settings_exit()
+void huawei_radio_settings_exit(void)
 {
 	ofono_radio_settings_driver_unregister(&driver);
 }
diff --git a/drivers/huaweimodem/voicecall.c b/drivers/huaweimodem/voicecall.c
index ff08124..0c0aaa1 100644
--- a/drivers/huaweimodem/voicecall.c
+++ b/drivers/huaweimodem/voicecall.c
@@ -508,12 +508,12 @@ static struct ofono_voicecall_driver driver = {
 	.release_specific	= huawei_release_specific,
 };
 
-void huawei_voicecall_init()
+void huawei_voicecall_init(void)
 {
 	ofono_voicecall_driver_register(&driver);
 }
 
-void huawei_voicecall_exit()
+void huawei_voicecall_exit(void)
 {
 	ofono_voicecall_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 07/16] stemodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 2717 bytes --]

---
 drivers/stemodem/gprs-context.c   |    4 ++--
 drivers/stemodem/radio-settings.c |    4 ++--
 drivers/stemodem/stemodem.h       |   12 ++++++------
 drivers/stemodem/voicecall.c      |    4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index 1762fb3..4325628 100644
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -596,13 +596,13 @@ static struct ofono_gprs_context_driver driver = {
 	.deactivate_primary	= ste_gprs_deactivate_primary,
 };
 
-void ste_gprs_context_init()
+void ste_gprs_context_init(void)
 {
 	caif_rtnl_init();
 	ofono_gprs_context_driver_register(&driver);
 }
 
-void ste_gprs_context_exit()
+void ste_gprs_context_exit(void)
 {
 	ofono_gprs_context_driver_unregister(&driver);
 	caif_rtnl_exit();
diff --git a/drivers/stemodem/radio-settings.c b/drivers/stemodem/radio-settings.c
index e65baf4..5b50126 100644
--- a/drivers/stemodem/radio-settings.c
+++ b/drivers/stemodem/radio-settings.c
@@ -220,12 +220,12 @@ static struct ofono_radio_settings_driver driver = {
 	.set_rat_mode	= ste_set_rat_mode
 };
 
-void ste_radio_settings_init()
+void ste_radio_settings_init(void)
 {
 	ofono_radio_settings_driver_register(&driver);
 }
 
-void ste_radio_settings_exit()
+void ste_radio_settings_exit(void)
 {
 	ofono_radio_settings_driver_unregister(&driver);
 }
diff --git a/drivers/stemodem/stemodem.h b/drivers/stemodem/stemodem.h
index b1691a2..f522ecd 100644
--- a/drivers/stemodem/stemodem.h
+++ b/drivers/stemodem/stemodem.h
@@ -22,11 +22,11 @@
 
 #include <drivers/atmodem/atutil.h>
 
-extern void ste_gprs_context_init();
-extern void ste_gprs_context_exit();
+extern void ste_gprs_context_init(void);
+extern void ste_gprs_context_exit(void);
 
-extern void ste_voicecall_init();
-extern void ste_voicecall_exit();
+extern void ste_voicecall_init(void);
+extern void ste_voicecall_exit(void);
 
-extern void ste_radio_settings_init();
-extern void ste_radio_settings_exit();
+extern void ste_radio_settings_init(void);
+extern void ste_radio_settings_exit(void);
diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c
index 99383cf..8f3533d 100644
--- a/drivers/stemodem/voicecall.c
+++ b/drivers/stemodem/voicecall.c
@@ -597,12 +597,12 @@ static struct ofono_voicecall_driver driver = {
 	.send_tones		= ste_send_dtmf
 };
 
-void ste_voicecall_init()
+void ste_voicecall_init(void)
 {
 	ofono_voicecall_driver_register(&driver);
 }
 
-void ste_voicecall_exit()
+void ste_voicecall_exit(void)
 {
 	ofono_voicecall_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 08/16] calypsomodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 1874 bytes --]

---
 drivers/calypsomodem/calypsomodem.h |    8 ++++----
 drivers/calypsomodem/stk.c          |    4 ++--
 drivers/calypsomodem/voicecall.c    |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/calypsomodem/calypsomodem.h b/drivers/calypsomodem/calypsomodem.h
index caf7a3d..47ebf34 100644
--- a/drivers/calypsomodem/calypsomodem.h
+++ b/drivers/calypsomodem/calypsomodem.h
@@ -21,8 +21,8 @@
 
 #include <drivers/atmodem/atutil.h>
 
-extern void calypso_voicecall_init();
-extern void calypso_voicecall_exit();
+extern void calypso_voicecall_init(void);
+extern void calypso_voicecall_exit(void);
 
-extern void calypso_stk_init();
-extern void calypso_stk_exit();
+extern void calypso_stk_init(void);
+extern void calypso_stk_exit(void);
diff --git a/drivers/calypsomodem/stk.c b/drivers/calypsomodem/stk.c
index 203cb9b..196b9e3 100644
--- a/drivers/calypsomodem/stk.c
+++ b/drivers/calypsomodem/stk.c
@@ -300,12 +300,12 @@ static struct ofono_stk_driver driver = {
 	.terminal_response	= calypso_stk_terminal_response,
 };
 
-void calypso_stk_init()
+void calypso_stk_init(void)
 {
 	ofono_stk_driver_register(&driver);
 }
 
-void calypso_stk_exit()
+void calypso_stk_exit(void)
 {
 	ofono_stk_driver_unregister(&driver);
 }
diff --git a/drivers/calypsomodem/voicecall.c b/drivers/calypsomodem/voicecall.c
index 0e6a388..f87e480 100644
--- a/drivers/calypsomodem/voicecall.c
+++ b/drivers/calypsomodem/voicecall.c
@@ -434,12 +434,12 @@ static struct ofono_voicecall_driver driver = {
 	.send_tones		= calypso_send_dtmf
 };
 
-void calypso_voicecall_init()
+void calypso_voicecall_init(void)
 {
 	ofono_voicecall_driver_register(&driver);
 }
 
-void calypso_voicecall_exit()
+void calypso_voicecall_exit(void)
 {
 	ofono_voicecall_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 09/16] ifxmodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 4145 bytes --]

---
 drivers/ifxmodem/audio-settings.c |    4 ++--
 drivers/ifxmodem/gprs-context.c   |    4 ++--
 drivers/ifxmodem/ifxmodem.h       |   20 ++++++++++----------
 drivers/ifxmodem/radio-settings.c |    4 ++--
 drivers/ifxmodem/stk.c            |    4 ++--
 drivers/ifxmodem/voicecall.c      |    4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/ifxmodem/audio-settings.c b/drivers/ifxmodem/audio-settings.c
index 8273335..287221f 100644
--- a/drivers/ifxmodem/audio-settings.c
+++ b/drivers/ifxmodem/audio-settings.c
@@ -145,12 +145,12 @@ static struct ofono_audio_settings_driver driver = {
 	.remove		= ifx_audio_settings_remove,
 };
 
-void ifx_audio_settings_init()
+void ifx_audio_settings_init(void)
 {
 	ofono_audio_settings_driver_register(&driver);
 }
 
-void ifx_audio_settings_exit()
+void ifx_audio_settings_exit(void)
 {
 	ofono_audio_settings_driver_unregister(&driver);
 }
diff --git a/drivers/ifxmodem/gprs-context.c b/drivers/ifxmodem/gprs-context.c
index fcfe698..2c68b44 100644
--- a/drivers/ifxmodem/gprs-context.c
+++ b/drivers/ifxmodem/gprs-context.c
@@ -489,12 +489,12 @@ static struct ofono_gprs_context_driver driver = {
 	.deactivate_primary	= ifx_gprs_deactivate_primary,
 };
 
-void ifx_gprs_context_init()
+void ifx_gprs_context_init(void)
 {
 	ofono_gprs_context_driver_register(&driver);
 }
 
-void ifx_gprs_context_exit()
+void ifx_gprs_context_exit(void)
 {
 	ofono_gprs_context_driver_unregister(&driver);
 }
diff --git a/drivers/ifxmodem/ifxmodem.h b/drivers/ifxmodem/ifxmodem.h
index 8ea52e5..fbd3c06 100644
--- a/drivers/ifxmodem/ifxmodem.h
+++ b/drivers/ifxmodem/ifxmodem.h
@@ -21,17 +21,17 @@
 
 #include <drivers/atmodem/atutil.h>
 
-extern void ifx_voicecall_init();
-extern void ifx_voicecall_exit();
+extern void ifx_voicecall_init(void);
+extern void ifx_voicecall_exit(void);
 
-extern void ifx_audio_settings_init();
-extern void ifx_audio_settings_exit();
+extern void ifx_audio_settings_init(void);
+extern void ifx_audio_settings_exit(void);
 
-extern void ifx_radio_settings_init();
-extern void ifx_radio_settings_exit();
+extern void ifx_radio_settings_init(void);
+extern void ifx_radio_settings_exit(void);
 
-extern void ifx_gprs_context_init();
-extern void ifx_gprs_context_exit();
+extern void ifx_gprs_context_init(void);
+extern void ifx_gprs_context_exit(void);
 
-extern void ifx_stk_init();
-extern void ifx_stk_exit();
+extern void ifx_stk_init(void);
+extern void ifx_stk_exit(void);
diff --git a/drivers/ifxmodem/radio-settings.c b/drivers/ifxmodem/radio-settings.c
index 2ec94f1..fd590ae 100644
--- a/drivers/ifxmodem/radio-settings.c
+++ b/drivers/ifxmodem/radio-settings.c
@@ -204,12 +204,12 @@ static struct ofono_radio_settings_driver driver = {
 	.set_rat_mode		= ifx_set_rat_mode
 };
 
-void ifx_radio_settings_init()
+void ifx_radio_settings_init(void)
 {
 	ofono_radio_settings_driver_register(&driver);
 }
 
-void ifx_radio_settings_exit()
+void ifx_radio_settings_exit(void)
 {
 	ofono_radio_settings_driver_unregister(&driver);
 }
diff --git a/drivers/ifxmodem/stk.c b/drivers/ifxmodem/stk.c
index 6494c4d..1a1805c 100644
--- a/drivers/ifxmodem/stk.c
+++ b/drivers/ifxmodem/stk.c
@@ -306,12 +306,12 @@ static struct ofono_stk_driver driver = {
 	.terminal_response	= ifx_stk_terminal_response,
 };
 
-void ifx_stk_init()
+void ifx_stk_init(void)
 {
 	ofono_stk_driver_register(&driver);
 }
 
-void ifx_stk_exit()
+void ifx_stk_exit(void)
 {
 	ofono_stk_driver_unregister(&driver);
 }
diff --git a/drivers/ifxmodem/voicecall.c b/drivers/ifxmodem/voicecall.c
index d43e6f9..f673624 100644
--- a/drivers/ifxmodem/voicecall.c
+++ b/drivers/ifxmodem/voicecall.c
@@ -771,12 +771,12 @@ static struct ofono_voicecall_driver driver = {
 	.send_tones		= ifx_send_dtmf
 };
 
-void ifx_voicecall_init()
+void ifx_voicecall_init(void)
 {
 	ofono_voicecall_driver_register(&driver);
 }
 
-void ifx_voicecall_exit()
+void ifx_voicecall_exit(void)
 {
 	ofono_voicecall_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 10/16] hsomodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 1950 bytes --]

---
 drivers/hsomodem/gprs-context.c   |    4 ++--
 drivers/hsomodem/hsomodem.h       |    8 ++++----
 drivers/hsomodem/radio-settings.c |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/hsomodem/gprs-context.c b/drivers/hsomodem/gprs-context.c
index a3f55ab..d140d2e 100644
--- a/drivers/hsomodem/gprs-context.c
+++ b/drivers/hsomodem/gprs-context.c
@@ -389,12 +389,12 @@ static struct ofono_gprs_context_driver driver = {
 	.deactivate_primary	= hso_gprs_deactivate_primary,
 };
 
-void hso_gprs_context_init()
+void hso_gprs_context_init(void)
 {
 	ofono_gprs_context_driver_register(&driver);
 }
 
-void hso_gprs_context_exit()
+void hso_gprs_context_exit(void)
 {
 	ofono_gprs_context_driver_unregister(&driver);
 }
diff --git a/drivers/hsomodem/hsomodem.h b/drivers/hsomodem/hsomodem.h
index b75fafc..0f0b76f 100644
--- a/drivers/hsomodem/hsomodem.h
+++ b/drivers/hsomodem/hsomodem.h
@@ -21,8 +21,8 @@
 
 #include <drivers/atmodem/atutil.h>
 
-extern void hso_gprs_context_init();
-extern void hso_gprs_context_exit();
+extern void hso_gprs_context_init(void);
+extern void hso_gprs_context_exit(void);
 
-extern void hso_radio_settings_init();
-extern void hso_radio_settings_exit();
+extern void hso_radio_settings_init(void);
+extern void hso_radio_settings_exit(void);
diff --git a/drivers/hsomodem/radio-settings.c b/drivers/hsomodem/radio-settings.c
index 0f234ce..cefd415 100644
--- a/drivers/hsomodem/radio-settings.c
+++ b/drivers/hsomodem/radio-settings.c
@@ -205,12 +205,12 @@ static struct ofono_radio_settings_driver driver = {
 	.set_rat_mode		= hso_set_rat_mode
 };
 
-void hso_radio_settings_init()
+void hso_radio_settings_init(void)
 {
 	ofono_radio_settings_driver_register(&driver);
 }
 
-void hso_radio_settings_exit()
+void hso_radio_settings_exit(void)
 {
 	ofono_radio_settings_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 11/16] nwmodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]

---
 drivers/nwmodem/nwmodem.h        |    4 ++--
 drivers/nwmodem/radio-settings.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/nwmodem/nwmodem.h b/drivers/nwmodem/nwmodem.h
index 68a829b..e87f375 100644
--- a/drivers/nwmodem/nwmodem.h
+++ b/drivers/nwmodem/nwmodem.h
@@ -21,5 +21,5 @@
 
 #include <drivers/atmodem/atutil.h>
 
-extern void nw_radio_settings_init();
-extern void nw_radio_settings_exit();
+extern void nw_radio_settings_init(void);
+extern void nw_radio_settings_exit(void);
diff --git a/drivers/nwmodem/radio-settings.c b/drivers/nwmodem/radio-settings.c
index 36fab39..b8b5719 100644
--- a/drivers/nwmodem/radio-settings.c
+++ b/drivers/nwmodem/radio-settings.c
@@ -201,12 +201,12 @@ static struct ofono_radio_settings_driver driver = {
 	.set_rat_mode		= nw_set_rat_mode
 };
 
-void nw_radio_settings_init()
+void nw_radio_settings_init(void)
 {
 	ofono_radio_settings_driver_register(&driver);
 }
 
-void nw_radio_settings_exit()
+void nw_radio_settings_exit(void)
 {
 	ofono_radio_settings_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 12/16] isimodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 12172 bytes --]

---
 drivers/isimodem/audio-settings.c       |    4 +-
 drivers/isimodem/call-barring.c         |    4 +-
 drivers/isimodem/call-forwarding.c      |    4 +-
 drivers/isimodem/call-meter.c           |    4 +-
 drivers/isimodem/call-settings.c        |    4 +-
 drivers/isimodem/cbs.c                  |    4 +-
 drivers/isimodem/devinfo.c              |    4 +-
 drivers/isimodem/gprs-context.c         |    4 +-
 drivers/isimodem/isimodem.h             |   68 +++++++++++++++---------------
 drivers/isimodem/network-registration.c |    4 +-
 drivers/isimodem/phonebook.c            |    4 +-
 drivers/isimodem/radio-settings.c       |    4 +-
 drivers/isimodem/sim.c                  |    4 +-
 drivers/isimodem/sms.c                  |    4 +-
 drivers/isimodem/ssn.c                  |    4 +-
 drivers/isimodem/ussd.c                 |    4 +-
 drivers/isimodem/voicecall.c            |    4 +-
 17 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/drivers/isimodem/audio-settings.c b/drivers/isimodem/audio-settings.c
index fa17747..65c596b 100644
--- a/drivers/isimodem/audio-settings.c
+++ b/drivers/isimodem/audio-settings.c
@@ -121,12 +121,12 @@ static struct ofono_audio_settings_driver driver = {
 	.remove		= isi_audio_settings_remove,
 };
 
-void isi_audio_settings_init()
+void isi_audio_settings_init(void)
 {
 	ofono_audio_settings_driver_register(&driver);
 }
 
-void isi_audio_settings_exit()
+void isi_audio_settings_exit(void)
 {
 	ofono_audio_settings_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c
index 26ca545..a78b762 100644
--- a/drivers/isimodem/call-barring.c
+++ b/drivers/isimodem/call-barring.c
@@ -388,12 +388,12 @@ static struct ofono_call_barring_driver driver = {
 	.set_passwd		= isi_set_passwd
 };
 
-void isi_call_barring_init()
+void isi_call_barring_init(void)
 {
 	ofono_call_barring_driver_register(&driver);
 }
 
-void isi_call_barring_exit()
+void isi_call_barring_exit(void)
 {
 	ofono_call_barring_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c
index 3a98449..2fafb26 100644
--- a/drivers/isimodem/call-forwarding.c
+++ b/drivers/isimodem/call-forwarding.c
@@ -480,12 +480,12 @@ static struct ofono_call_forwarding_driver driver = {
 	.query			= isi_query
 };
 
-void isi_call_forwarding_init()
+void isi_call_forwarding_init(void)
 {
 	ofono_call_forwarding_driver_register(&driver);
 }
 
-void isi_call_forwarding_exit()
+void isi_call_forwarding_exit(void)
 {
 	ofono_call_forwarding_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/call-meter.c b/drivers/isimodem/call-meter.c
index 66dae47..04a3c10 100644
--- a/drivers/isimodem/call-meter.c
+++ b/drivers/isimodem/call-meter.c
@@ -131,12 +131,12 @@ static struct ofono_call_meter_driver driver = {
 	.puct_set		= isi_puct_set
 };
 
-void isi_call_meter_init()
+void isi_call_meter_init(void)
 {
 	ofono_call_meter_driver_register(&driver);
 }
 
-void isi_call_meter_exit()
+void isi_call_meter_exit(void)
 {
 	ofono_call_meter_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c
index 51a761f..89270e9 100644
--- a/drivers/isimodem/call-settings.c
+++ b/drivers/isimodem/call-settings.c
@@ -311,12 +311,12 @@ static struct ofono_call_settings_driver driver = {
 	.cw_set			= isi_cw_set
 };
 
-void isi_call_settings_init()
+void isi_call_settings_init(void)
 {
 	ofono_call_settings_driver_register(&driver);
 }
 
-void isi_call_settings_exit()
+void isi_call_settings_exit(void)
 {
 	ofono_call_settings_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/cbs.c b/drivers/isimodem/cbs.c
index 871e0ea..b969c1f 100644
--- a/drivers/isimodem/cbs.c
+++ b/drivers/isimodem/cbs.c
@@ -219,12 +219,12 @@ static struct ofono_cbs_driver driver = {
 	.clear_topics		= isi_clear_topics
 };
 
-void isi_cbs_init()
+void isi_cbs_init(void)
 {
 	ofono_cbs_driver_register(&driver);
 }
 
-void isi_cbs_exit()
+void isi_cbs_exit(void)
 {
 	ofono_cbs_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c
index bb30730..3bf05f4 100644
--- a/drivers/isimodem/devinfo.c
+++ b/drivers/isimodem/devinfo.c
@@ -260,12 +260,12 @@ static struct ofono_devinfo_driver driver = {
 	.query_serial		= isi_query_serial
 };
 
-void isi_devinfo_init()
+void isi_devinfo_init(void)
 {
 	ofono_devinfo_driver_register(&driver);
 }
 
-void isi_devinfo_exit()
+void isi_devinfo_exit(void)
 {
 	ofono_devinfo_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/gprs-context.c b/drivers/isimodem/gprs-context.c
index bfb496c..6d579d8 100644
--- a/drivers/isimodem/gprs-context.c
+++ b/drivers/isimodem/gprs-context.c
@@ -622,12 +622,12 @@ static struct ofono_gprs_context_driver driver = {
 	.deactivate_primary	= isi_gprs_deactivate_primary,
 };
 
-void isi_gprs_context_init()
+void isi_gprs_context_init(void)
 {
 	ofono_gprs_context_driver_register(&driver);
 }
 
-void isi_gprs_context_exit()
+void isi_gprs_context_exit(void)
 {
 	ofono_gprs_context_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/isimodem.h b/drivers/isimodem/isimodem.h
index 545a6dc..37191c7 100644
--- a/drivers/isimodem/isimodem.h
+++ b/drivers/isimodem/isimodem.h
@@ -21,53 +21,53 @@
 
 extern struct ofono_modem *isi_modem_by_interface(char const *ifname);
 
-extern void isi_phonebook_init();
-extern void isi_phonebook_exit();
+extern void isi_phonebook_init(void);
+extern void isi_phonebook_exit(void);
 
-extern void isi_devinfo_init();
-extern void isi_devinfo_exit();
+extern void isi_devinfo_init(void);
+extern void isi_devinfo_exit(void);
 
-extern void isi_netreg_init();
-extern void isi_netreg_exit();
+extern void isi_netreg_init(void);
+extern void isi_netreg_exit(void);
 
-extern void isi_voicecall_init();
-extern void isi_voicecall_exit();
+extern void isi_voicecall_init(void);
+extern void isi_voicecall_exit(void);
 
-extern void isi_sms_init();
-extern void isi_sms_exit();
+extern void isi_sms_init(void);
+extern void isi_sms_exit(void);
 
-extern void isi_cbs_init();
-extern void isi_cbs_exit();
+extern void isi_cbs_init(void);
+extern void isi_cbs_exit(void);
 
-extern void isi_sim_init();
-extern void isi_sim_exit();
+extern void isi_sim_init(void);
+extern void isi_sim_exit(void);
 
-extern void isi_ussd_init();
-extern void isi_ussd_exit();
+extern void isi_ussd_init(void);
+extern void isi_ussd_exit(void);
 
-extern void isi_ssn_init();
-extern void isi_ssn_exit();
+extern void isi_ssn_init(void);
+extern void isi_ssn_exit(void);
 
-extern void isi_call_forwarding_init();
-extern void isi_call_forwarding_exit();
+extern void isi_call_forwarding_init(void);
+extern void isi_call_forwarding_exit(void);
 
-extern void isi_call_settings_init();
-extern void isi_call_settings_exit();
+extern void isi_call_settings_init(void);
+extern void isi_call_settings_exit(void);
 
-extern void isi_call_barring_init();
-extern void isi_call_barring_exit();
+extern void isi_call_barring_init(void);
+extern void isi_call_barring_exit(void);
 
-extern void isi_call_meter_init();
-extern void isi_call_meter_exit();
+extern void isi_call_meter_init(void);
+extern void isi_call_meter_exit(void);
 
-extern void isi_radio_settings_init();
-extern void isi_radio_settings_exit();
+extern void isi_radio_settings_init(void);
+extern void isi_radio_settings_exit(void);
 
-extern void isi_gprs_init();
-extern void isi_gprs_exit();
+extern void isi_gprs_init(void);
+extern void isi_gprs_exit(void);
 
-extern void isi_gprs_context_init();
-extern void isi_gprs_context_exit();
+extern void isi_gprs_context_init(void);
+extern void isi_gprs_context_exit(void);
 
-extern void isi_audio_settings_init();
-extern void isi_audio_settings_exit();
+extern void isi_audio_settings_init(void);
+extern void isi_audio_settings_exit(void);
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c
index 3799b7f..47aaeb1 100644
--- a/drivers/isimodem/network-registration.c
+++ b/drivers/isimodem/network-registration.c
@@ -863,12 +863,12 @@ static struct ofono_netreg_driver driver = {
 	.strength		= isi_strength,
 };
 
-void isi_netreg_init()
+void isi_netreg_init(void)
 {
 	ofono_netreg_driver_register(&driver);
 }
 
-void isi_netreg_exit()
+void isi_netreg_exit(void)
 {
 	ofono_netreg_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c
index 234b708..1f92d37 100644
--- a/drivers/isimodem/phonebook.c
+++ b/drivers/isimodem/phonebook.c
@@ -345,12 +345,12 @@ static struct ofono_phonebook_driver driver = {
 	.export_entries		= isi_export_entries
 };
 
-void isi_phonebook_init()
+void isi_phonebook_init(void)
 {
 	ofono_phonebook_driver_register(&driver);
 }
 
-void isi_phonebook_exit()
+void isi_phonebook_exit(void)
 {
 	ofono_phonebook_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/radio-settings.c b/drivers/isimodem/radio-settings.c
index 21e3da5..5d99213 100644
--- a/drivers/isimodem/radio-settings.c
+++ b/drivers/isimodem/radio-settings.c
@@ -373,12 +373,12 @@ static struct ofono_radio_settings_driver driver = {
 	.set_fast_dormancy	= isi_set_fast_dormancy,
 };
 
-void isi_radio_settings_init()
+void isi_radio_settings_init(void)
 {
 	ofono_radio_settings_driver_register(&driver);
 }
 
-void isi_radio_settings_exit()
+void isi_radio_settings_exit(void)
 {
 	ofono_radio_settings_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c
index b45e166..991d8b7 100644
--- a/drivers/isimodem/sim.c
+++ b/drivers/isimodem/sim.c
@@ -497,12 +497,12 @@ static struct ofono_sim_driver driver = {
 	.read_imsi		= isi_read_imsi,
 };
 
-void isi_sim_init()
+void isi_sim_init(void)
 {
 	ofono_sim_driver_register(&driver);
 }
 
-void isi_sim_exit()
+void isi_sim_exit(void)
 {
 	ofono_sim_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/sms.c b/drivers/isimodem/sms.c
index 15e37a3..ded7d9c 100644
--- a/drivers/isimodem/sms.c
+++ b/drivers/isimodem/sms.c
@@ -732,12 +732,12 @@ static struct ofono_sms_driver driver = {
 	.bearer_set		= isi_bearer_set,
 };
 
-void isi_sms_init()
+void isi_sms_init(void)
 {
 	ofono_sms_driver_register(&driver);
 }
 
-void isi_sms_exit()
+void isi_sms_exit(void)
 {
 	ofono_sms_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/ssn.c b/drivers/isimodem/ssn.c
index 747a894..068e5e8 100644
--- a/drivers/isimodem/ssn.c
+++ b/drivers/isimodem/ssn.c
@@ -84,12 +84,12 @@ static struct ofono_ssn_driver driver = {
 	.remove			= isi_ssn_remove
 };
 
-void isi_ssn_init()
+void isi_ssn_init(void)
 {
 	ofono_ssn_driver_register(&driver);
 }
 
-void isi_ssn_exit()
+void isi_ssn_exit(void)
 {
 	ofono_ssn_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c
index 355b6db..d649484 100644
--- a/drivers/isimodem/ussd.c
+++ b/drivers/isimodem/ussd.c
@@ -278,12 +278,12 @@ static struct ofono_ussd_driver driver = {
 	.cancel			= isi_cancel
 };
 
-void isi_ussd_init()
+void isi_ussd_init(void)
 {
 	ofono_ussd_driver_register(&driver);
 }
 
-void isi_ussd_exit()
+void isi_ussd_exit(void)
 {
 	ofono_ussd_driver_unregister(&driver);
 }
diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index c19e64d..8a52b9a 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -1328,12 +1328,12 @@ static struct ofono_voicecall_driver driver = {
 	.send_tones		= isi_send_tones,
 };
 
-void isi_voicecall_init()
+void isi_voicecall_init(void)
 {
 	ofono_voicecall_driver_register(&driver);
 }
 
-void isi_voicecall_exit()
+void isi_voicecall_exit(void)
 {
 	ofono_voicecall_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 13/16] atmodem: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 11951 bytes --]

---
 drivers/atmodem/atmodem.h              |   68 ++++++++++++++++----------------
 drivers/atmodem/call-barring.c         |    4 +-
 drivers/atmodem/call-forwarding.c      |    4 +-
 drivers/atmodem/call-meter.c           |    4 +-
 drivers/atmodem/call-settings.c        |    4 +-
 drivers/atmodem/call-volume.c          |    4 +-
 drivers/atmodem/cbs.c                  |    4 +-
 drivers/atmodem/gprs-context.c         |    4 +-
 drivers/atmodem/gprs.c                 |    4 +-
 drivers/atmodem/network-registration.c |    4 +-
 drivers/atmodem/phonebook.c            |    6 +-
 drivers/atmodem/sim.c                  |    4 +-
 drivers/atmodem/sms.c                  |    4 +-
 drivers/atmodem/ssn.c                  |    4 +-
 drivers/atmodem/stk.c                  |    4 +-
 drivers/atmodem/ussd.c                 |    4 +-
 drivers/atmodem/voicecall.c            |    4 +-
 17 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/drivers/atmodem/atmodem.h b/drivers/atmodem/atmodem.h
index 2ee47f5..c7f0eed 100644
--- a/drivers/atmodem/atmodem.h
+++ b/drivers/atmodem/atmodem.h
@@ -21,53 +21,53 @@
 
 #include "atutil.h"
 
-extern void at_netreg_init();
-extern void at_netreg_exit();
+extern void at_netreg_init(void);
+extern void at_netreg_exit(void);
 
-extern void at_call_forwarding_init();
-extern void at_call_forwarding_exit();
+extern void at_call_forwarding_init(void);
+extern void at_call_forwarding_exit(void);
 
-extern void at_call_settings_init();
-extern void at_call_settings_exit();
+extern void at_call_settings_init(void);
+extern void at_call_settings_exit(void);
 
-extern void at_ussd_init();
-extern void at_ussd_exit();
+extern void at_ussd_init(void);
+extern void at_ussd_exit(void);
 
-extern void at_voicecall_init();
-extern void at_voicecall_exit();
+extern void at_voicecall_init(void);
+extern void at_voicecall_exit(void);
 
-extern void at_call_meter_init();
-extern void at_call_meter_exit();
+extern void at_call_meter_init(void);
+extern void at_call_meter_exit(void);
 
-extern void at_call_barring_init();
-extern void at_call_barring_exit();
+extern void at_call_barring_init(void);
+extern void at_call_barring_exit(void);
 
-extern void at_sim_init();
-extern void at_sim_exit();
+extern void at_sim_init(void);
+extern void at_sim_exit(void);
 
-extern void at_stk_init();
-extern void at_stk_exit();
+extern void at_stk_init(void);
+extern void at_stk_exit(void);
 
-extern void at_sms_init();
-extern void at_sms_exit();
+extern void at_sms_init(void);
+extern void at_sms_exit(void);
 
-extern void at_phonebook_init();
-extern void at_phonebook_exit();
+extern void at_phonebook_init(void);
+extern void at_phonebook_exit(void);
 
-extern void at_ssn_init();
-extern void at_ssn_exit();
+extern void at_ssn_init(void);
+extern void at_ssn_exit(void);
 
-extern void at_devinfo_init();
-extern void at_devinfo_exit();
+extern void at_devinfo_init(void);
+extern void at_devinfo_exit(void);
 
-extern void at_cbs_init();
-extern void at_cbs_exit();
+extern void at_cbs_init(void);
+extern void at_cbs_exit(void);
 
-extern void at_call_volume_init();
-extern void at_call_volume_exit();
+extern void at_call_volume_init(void);
+extern void at_call_volume_exit(void);
 
-extern void at_gprs_init();
-extern void at_gprs_exit();
+extern void at_gprs_init(void);
+extern void at_gprs_exit(void);
 
-extern void at_gprs_context_init();
-extern void at_gprs_context_exit();
+extern void at_gprs_context_init(void);
+extern void at_gprs_context_exit(void);
diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c
index c0b1d11..516b470 100644
--- a/drivers/atmodem/call-barring.c
+++ b/drivers/atmodem/call-barring.c
@@ -217,12 +217,12 @@ static struct ofono_call_barring_driver driver = {
 	.set_passwd	= at_call_barring_set_passwd,
 };
 
-void at_call_barring_init()
+void at_call_barring_init(void)
 {
 	ofono_call_barring_driver_register(&driver);
 }
 
-void at_call_barring_exit()
+void at_call_barring_exit(void)
 {
 	ofono_call_barring_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c
index a74d4c3..f11a68e 100644
--- a/drivers/atmodem/call-forwarding.c
+++ b/drivers/atmodem/call-forwarding.c
@@ -282,12 +282,12 @@ static struct ofono_call_forwarding_driver driver = {
 	.erasure	= at_ccfc_erasure
 };
 
-void at_call_forwarding_init()
+void at_call_forwarding_init(void)
 {
 	ofono_call_forwarding_driver_register(&driver);
 }
 
-void at_call_forwarding_exit()
+void at_call_forwarding_exit(void)
 {
 	ofono_call_forwarding_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/call-meter.c b/drivers/atmodem/call-meter.c
index 5c93397..3ab4706 100644
--- a/drivers/atmodem/call-meter.c
+++ b/drivers/atmodem/call-meter.c
@@ -372,12 +372,12 @@ static struct ofono_call_meter_driver driver = {
 	.puct_set = at_cpuc_set,
 };
 
-void at_call_meter_init()
+void at_call_meter_init(void)
 {
 	ofono_call_meter_driver_register(&driver);
 }
 
-void at_call_meter_exit()
+void at_call_meter_exit(void)
 {
 	ofono_call_meter_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c
index 3340d5a..7b00357 100644
--- a/drivers/atmodem/call-settings.c
+++ b/drivers/atmodem/call-settings.c
@@ -395,12 +395,12 @@ static struct ofono_call_settings_driver driver = {
 	.cw_set = at_ccwa_set,
 };
 
-void at_call_settings_init()
+void at_call_settings_init(void)
 {
 	ofono_call_settings_driver_register(&driver);
 }
 
-void at_call_settings_exit()
+void at_call_settings_exit(void)
 {
 	ofono_call_settings_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/call-volume.c b/drivers/atmodem/call-volume.c
index fbec668..d3910d4 100644
--- a/drivers/atmodem/call-volume.c
+++ b/drivers/atmodem/call-volume.c
@@ -222,12 +222,12 @@ static struct ofono_call_volume_driver driver = {
 	.mute = at_call_volume_mute,
 };
 
-void at_call_volume_init()
+void at_call_volume_init(void)
 {
 	ofono_call_volume_driver_register(&driver);
 }
 
-void at_call_volume_exit()
+void at_call_volume_exit(void)
 {
 	ofono_call_volume_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/cbs.c b/drivers/atmodem/cbs.c
index 479bfea..44e154d 100644
--- a/drivers/atmodem/cbs.c
+++ b/drivers/atmodem/cbs.c
@@ -269,12 +269,12 @@ static struct ofono_cbs_driver driver = {
 	.clear_topics = at_cbs_clear_topics,
 };
 
-void at_cbs_init()
+void at_cbs_init(void)
 {
 	ofono_cbs_driver_register(&driver);
 }
 
-void at_cbs_exit()
+void at_cbs_exit(void)
 {
 	ofono_cbs_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
index 6b657f3..56d65d4 100644
--- a/drivers/atmodem/gprs-context.c
+++ b/drivers/atmodem/gprs-context.c
@@ -317,12 +317,12 @@ static struct ofono_gprs_context_driver driver = {
 	.deactivate_primary	= at_gprs_deactivate_primary,
 };
 
-void at_gprs_context_init()
+void at_gprs_context_init(void)
 {
 	ofono_gprs_context_driver_register(&driver);
 }
 
-void at_gprs_context_exit()
+void at_gprs_context_exit(void)
 {
 	ofono_gprs_context_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c
index 8cff35b..defb154 100644
--- a/drivers/atmodem/gprs.c
+++ b/drivers/atmodem/gprs.c
@@ -382,12 +382,12 @@ static struct ofono_gprs_driver driver = {
 	.attached_status	= at_gprs_registration_status,
 };
 
-void at_gprs_init()
+void at_gprs_init(void)
 {
 	ofono_gprs_driver_register(&driver);
 }
 
-void at_gprs_exit()
+void at_gprs_exit(void)
 {
 	ofono_gprs_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index f18b9d7..0c77ba8 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -1346,12 +1346,12 @@ static struct ofono_netreg_driver driver = {
 	.strength			= at_signal_strength,
 };
 
-void at_netreg_init()
+void at_netreg_init(void)
 {
 	ofono_netreg_driver_register(&driver);
 }
 
-void at_netreg_exit()
+void at_netreg_exit(void)
 {
 	ofono_netreg_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c
index 731205e..64aa05e 100644
--- a/drivers/atmodem/phonebook.c
+++ b/drivers/atmodem/phonebook.c
@@ -63,7 +63,7 @@ struct pb_data {
 	guint ready_id;
 };
 
-static void warn_bad()
+static void warn_bad(void)
 {
 	ofono_warn("Name field conversion to UTF8 failed, this can indicate a"
 			" problem with modem integration, as this field"
@@ -569,12 +569,12 @@ static struct ofono_phonebook_driver driver = {
 	.export_entries	= at_export_entries
 };
 
-void at_phonebook_init()
+void at_phonebook_init(void)
 {
 	ofono_phonebook_driver_register(&driver);
 }
 
-void at_phonebook_exit()
+void at_phonebook_exit(void)
 {
 	ofono_phonebook_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index b1d971d..c5f4a44 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -996,12 +996,12 @@ static struct ofono_sim_driver driver = {
 	.query_locked		= at_pin_query_enabled,
 };
 
-void at_sim_init()
+void at_sim_init(void)
 {
 	ofono_sim_driver_register(&driver);
 }
 
-void at_sim_exit()
+void at_sim_exit(void)
 {
 	ofono_sim_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index 559b570..c570886 100644
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -1256,12 +1256,12 @@ static struct ofono_sms_driver driver = {
 	.bearer_set	= at_cgsms_set,
 };
 
-void at_sms_init()
+void at_sms_init(void)
 {
 	ofono_sms_driver_register(&driver);
 }
 
-void at_sms_exit()
+void at_sms_exit(void)
 {
 	ofono_sms_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/ssn.c b/drivers/atmodem/ssn.c
index c0e2040..b7a9df4 100644
--- a/drivers/atmodem/ssn.c
+++ b/drivers/atmodem/ssn.c
@@ -136,12 +136,12 @@ static struct ofono_ssn_driver driver = {
 	.remove = at_ssn_remove,
 };
 
-void at_ssn_init()
+void at_ssn_init(void)
 {
 	ofono_ssn_driver_register(&driver);
 }
 
-void at_ssn_exit()
+void at_ssn_exit(void)
 {
 	ofono_ssn_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/stk.c b/drivers/atmodem/stk.c
index fa8175a..4de3042 100644
--- a/drivers/atmodem/stk.c
+++ b/drivers/atmodem/stk.c
@@ -335,12 +335,12 @@ static struct ofono_stk_driver driver = {
 	.terminal_response	= at_stk_terminal_response,
 };
 
-void at_stk_init()
+void at_stk_init(void)
 {
 	ofono_stk_driver_register(&driver);
 }
 
-void at_stk_exit()
+void at_stk_exit(void)
 {
 	ofono_stk_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index 78f6004..651b6af 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -340,12 +340,12 @@ static struct ofono_ussd_driver driver = {
 	.cancel		= at_ussd_cancel
 };
 
-void at_ussd_init()
+void at_ussd_init(void)
 {
 	ofono_ussd_driver_register(&driver);
 }
 
-void at_ussd_exit()
+void at_ussd_exit(void)
 {
 	ofono_ussd_driver_unregister(&driver);
 }
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index 75e0c93..13862fb 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -1027,12 +1027,12 @@ static struct ofono_voicecall_driver driver = {
 	.send_tones		= at_send_dtmf
 };
 
-void at_voicecall_init()
+void at_voicecall_init(void)
 {
 	ofono_voicecall_driver_register(&driver);
 }
 
-void at_voicecall_exit()
+void at_voicecall_exit(void)
 {
 	ofono_voicecall_driver_unregister(&driver);
 }
-- 
1.7.0.4

[PATCH 14/16] plugins: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 2560 bytes --]

---
 plugins/bluetooth.h         |    2 +-
 plugins/hfp.c               |    6 +++---
 plugins/push-notification.c |    4 ++--
 plugins/smart-messaging.c   |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/bluetooth.h b/plugins/bluetooth.h
index f187529..42b0d13 100644
--- a/plugins/bluetooth.h
+++ b/plugins/bluetooth.h
@@ -35,7 +35,7 @@ struct bluetooth_profile {
 	const char *name;
 	int (*create)(const char *device, const char *dev_addr,
 			const char *adapter_addr, const char *alias);
-	void (*remove_all)();
+	void (*remove_all)(void);
 	void (*set_alias)(const char *device, const char *);
 };
 
diff --git a/plugins/hfp.c b/plugins/hfp.c
index d8d30b0..12d3457 100644
--- a/plugins/hfp.c
+++ b/plugins/hfp.c
@@ -453,7 +453,7 @@ static gboolean hfp_remove_each_modem(gpointer key, gpointer value,
 	return TRUE;
 }
 
-static void hfp_remove_all_modem()
+static void hfp_remove_all_modem(void)
 {
 	if (modem_hash == NULL)
 		return;
@@ -682,7 +682,7 @@ static struct bluetooth_profile hfp_profile = {
 	.set_alias	= hfp_set_alias,
 };
 
-static int hfp_init()
+static int hfp_init(void)
 {
 	int err;
 
@@ -707,7 +707,7 @@ static int hfp_init()
 	return 0;
 }
 
-static void hfp_exit()
+static void hfp_exit(void)
 {
 	bluetooth_unregister_uuid(HFP_AG_UUID);
 	ofono_modem_driver_unregister(&hfp_driver);
diff --git a/plugins/push-notification.c b/plugins/push-notification.c
index d910f70..218bf8c 100644
--- a/plugins/push-notification.c
+++ b/plugins/push-notification.c
@@ -224,7 +224,7 @@ static void call_modemwatch(struct ofono_modem *modem, void *user)
 	modem_watch(modem, TRUE, user);
 }
 
-static int push_notification_init()
+static int push_notification_init(void)
 {
 	DBG("");
 
@@ -235,7 +235,7 @@ static int push_notification_init()
 	return 0;
 }
 
-static void push_notification_exit()
+static void push_notification_exit(void)
 {
 	DBG("");
 
diff --git a/plugins/smart-messaging.c b/plugins/smart-messaging.c
index e7889f2..40af89f 100644
--- a/plugins/smart-messaging.c
+++ b/plugins/smart-messaging.c
@@ -345,7 +345,7 @@ static void call_modemwatch(struct ofono_modem *modem, void *user)
 	modem_watch(modem, TRUE, user);
 }
 
-static int smart_messaging_init()
+static int smart_messaging_init(void)
 {
 	DBG("");
 
@@ -356,7 +356,7 @@ static int smart_messaging_init()
 	return 0;
 }
 
-static void smart_messaging_exit()
+static void smart_messaging_exit(void)
 {
 	DBG("");
 
-- 
1.7.0.4

[PATCH 15/16] unit: M15 coding style fix

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 10434 bytes --]

---
 unit/test-common.c  |    6 +++---
 unit/test-idmap.c   |    4 ++--
 unit/test-mux.c     |    8 ++++----
 unit/test-simutil.c |   14 +++++++-------
 unit/test-sms.c     |   26 +++++++++++++-------------
 unit/test-util.c    |   20 ++++++++++----------
 6 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/unit/test-common.c b/unit/test-common.c
index baed178..0ade9a0 100644
--- a/unit/test-common.c
+++ b/unit/test-common.c
@@ -56,7 +56,7 @@ static const char *invalid_strings[] = {
 	NULL
 };
 
-static void test_invalid()
+static void test_invalid(void)
 {
 	char *sc;
 	char *sia;
@@ -107,7 +107,7 @@ static const char *valid_strings[] = {
 	NULL
 };
 
-static void test_valid()
+static void test_valid(void)
 {
 	char *sc;
 	char *sia;
@@ -158,7 +158,7 @@ static const char *invalid_apns[] = {
 	NULL
 };
 
-static void test_apn()
+static void test_apn(void)
 {
 	int i;
 	gboolean res;
diff --git a/unit/test-idmap.c b/unit/test-idmap.c
index bf428f8..17e767c 100644
--- a/unit/test-idmap.c
+++ b/unit/test-idmap.c
@@ -27,7 +27,7 @@
 
 #include "idmap.h"
 
-static void test_alloc()
+static void test_alloc(void)
 {
 	struct idmap *idmap;
 	unsigned int bit;
@@ -65,7 +65,7 @@ static void test_alloc()
 	idmap_free(idmap);
 }
 
-static void test_alloc_next()
+static void test_alloc_next(void)
 {
 	struct idmap *idmap;
 	unsigned int bit;
diff --git a/unit/test-mux.c b/unit/test-mux.c
index d0e2d32..2efa49d 100644
--- a/unit/test-mux.c
+++ b/unit/test-mux.c
@@ -280,7 +280,7 @@ static const guint8 basic_long_frame_result[] =
 	0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x88, 0xF9
 };
 
-static void test_fill_basic()
+static void test_fill_basic(void)
 {
 	guint8 control_frame[6];
 	guint8 data_frame[128];
@@ -327,7 +327,7 @@ static const guint8 advanced_quoted_data_result[] =
 	{ 0x7E, 0x07, 0xEF, 0x12, 0x34, 0x56, 0x7D, 0x5E, 0x78,
 		0x7D, 0x5D, 0x05, 0x7E };
 
-static void test_fill_advanced()
+static void test_fill_advanced(void)
 {
 	guint8 control_frame[8];
 	guint8 data_frame[128];
@@ -368,7 +368,7 @@ static int basic_frame_size = 7;
 
 static const guint8 basic_output[] = { 0x12, 0x34, 0x56 };
 
-static void test_extract_basic()
+static void test_extract_basic(void)
 {
 	int total = 0;
 	int nread;
@@ -467,7 +467,7 @@ static int advanced_frame_size = 6;
 
 static const guint8 advanced_output[] = { 0x12, 0x34, 0x56 };
 
-static void test_extract_advanced()
+static void test_extract_advanced(void)
 {
 	int total = 0;
 	int nread;
diff --git a/unit/test-simutil.c b/unit/test-simutil.c
index 155cddd..7cb5c10 100644
--- a/unit/test-simutil.c
+++ b/unit/test-simutil.c
@@ -80,12 +80,12 @@ static void test_buffer(const unsigned char *buf, size_t size)
 	g_assert(ber_tlv_iter_next(&iter) == FALSE);
 }
 
-static void test_ber_tlv_iter()
+static void test_ber_tlv_iter(void)
 {
 	test_buffer(valid_mms_params, sizeof(valid_mms_params));
 }
 
-static void test_ber_tlv_builder_mms()
+static void test_ber_tlv_builder_mms(void)
 {
 	struct ber_tlv_iter top_iter, nested_iter;
 	struct ber_tlv_builder top_builder, nested_builder;
@@ -128,7 +128,7 @@ static void test_ber_tlv_builder_mms()
 	test_buffer(pdu, pdulen);
 }
 
-static void test_ber_tlv_builder_efpnn()
+static void test_ber_tlv_builder_efpnn(void)
 {
 	struct sim_eons *eons_info;
 	unsigned char efpnn0[64], efpnn1[64];
@@ -188,7 +188,7 @@ static void test_ber_tlv_builder_efpnn()
 	sim_eons_free(eons_info);
 }
 
-static void test_ber_tlv_builder_3g_status()
+static void test_ber_tlv_builder_3g_status(void)
 {
 	unsigned char buf[512];
 	struct ber_tlv_builder top_builder, nested_builder;
@@ -351,7 +351,7 @@ const unsigned char valid_efpnn[][28] = {
 	  0x53, 0x68, 0x6F, 0x72, 0x74, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }
 };
 
-static void test_eons()
+static void test_eons(void)
 {
 	const struct sim_eons_operator_info *op_info;
 	struct sim_eons *eons_info;
@@ -383,7 +383,7 @@ static void test_eons()
 	sim_eons_free(eons_info);
 }
 
-static void test_ef_db()
+static void test_ef_db(void)
 {
 	struct sim_ef_info *info;
 
@@ -405,7 +405,7 @@ static const char *binary_ef = "62178202412183022F058A01058B032F060F8002000A"
 static const char *record_ef = "62198205422100200483026F408A01058B036F0607"
 				"800200808800";
 
-static void test_3g_status_data()
+static void test_3g_status_data(void)
 {
 	unsigned char *response;
 	long len;
diff --git a/unit/test-sms.c b/unit/test-sms.c
index 134a4b1..abaed35 100644
--- a/unit/test-sms.c
+++ b/unit/test-sms.c
@@ -143,7 +143,7 @@ static void dump_details(struct sms *sms)
 	}
 }
 
-static void test_simple_deliver()
+static void test_simple_deliver(void)
 {
 	struct sms sms;
 	unsigned char *decoded_pdu;
@@ -214,7 +214,7 @@ static void test_simple_deliver()
 	g_free(utf8);
 }
 
-static void test_alnum_sender()
+static void test_alnum_sender(void)
 {
 	struct sms sms;
 	unsigned char *decoded_pdu;
@@ -285,7 +285,7 @@ static void test_alnum_sender()
 	g_free(utf8);
 }
 
-static void test_deliver_encode()
+static void test_deliver_encode(void)
 {
 	struct sms sms;
 	unsigned char *decoded_pdu;
@@ -361,7 +361,7 @@ static void test_deliver_encode()
 	g_free(encoded_pdu);
 }
 
-static void test_simple_submit()
+static void test_simple_submit(void)
 {
 	struct sms sms;
 	unsigned char *decoded_pdu;
@@ -427,7 +427,7 @@ static void test_simple_submit()
 	g_free(utf8);
 }
 
-static void test_submit_encode()
+static void test_submit_encode(void)
 {
 	struct sms sms;
 	unsigned char *decoded_pdu;
@@ -931,7 +931,7 @@ static const char *assembly_pdu3 = "038121F340048155550119906041001222044A0500"
 					"00431044B043B0020043D04300433002E";
 static int assembly_pdu_len3 = 89;
 
-static void test_assembly()
+static void test_assembly(void)
 {
 	unsigned char pdu[176];
 	long pdu_len;
@@ -1018,7 +1018,7 @@ static const char *expected_no_fragmentation_7bit = "079153485002020911000C915"
 			"348870420140000A71154747A0E4ACF41F4F29C9E769F4121";
 static const char *sc_addr = "+358405202090";
 static const char *da_addr = "+358478400241";
-static void test_prepare_7bit()
+static void test_prepare_7bit(void)
 {
 	GSList *r;
 	struct sms *sms;
@@ -1205,7 +1205,7 @@ static void test_limit(gunichar uni, int target_size, gboolean use_16bit)
 	g_free(utf8);
 }
 
-static void test_prepare_limits()
+static void test_prepare_limits(void)
 {
 	gunichar ascii = 0x41;
 	gunichar ucs2 = 0x416;
@@ -1236,7 +1236,7 @@ static const char *cbs2 = "0110003201114679785E96371A8D46A3D168341A8D46A3D1683"
 	"41A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168"
 	"341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D100";
 
-static void test_cbs_encode_decode()
+static void test_cbs_encode_decode(void)
 {
 	unsigned char *decoded_pdu;
 	long pdu_len;
@@ -1301,7 +1301,7 @@ static void test_cbs_encode_decode()
 	g_free(encoded_pdu);
 }
 
-static void test_cbs_assembly()
+static void test_cbs_assembly(void)
 {
 	unsigned char *decoded_pdu;
 	long pdu_len;
@@ -1389,7 +1389,7 @@ static void test_cbs_assembly()
 	cbs_assembly_free(assembly);
 }
 
-static void test_serialize_assembly()
+static void test_serialize_assembly(void)
 {
 	unsigned char pdu[176];
 	long pdu_len;
@@ -1447,7 +1447,7 @@ static const char *ranges[] = { "1-5, 2, 3, 600, 569-900, 999",
 static const char *inv_ranges[] = { "1-5, 3333", "1-5, afbcd", "1-5, 3-5,,",
 					"1-5, 3-5, c", NULL };
 
-static void test_range_minimizer()
+static void test_range_minimizer(void)
 {
 	int i = 0;
 
@@ -1480,7 +1480,7 @@ static void test_range_minimizer()
 	}
 }
 
-static void test_sr_assembly()
+static void test_sr_assembly(void)
 {
 	const char *sr_pdu1 = "06040D91945152991136F00160124130340A0160124130"
 				"940A00";
diff --git a/unit/test-util.c b/unit/test-util.c
index 057bb76..c0d0bf1 100644
--- a/unit/test-util.c
+++ b/unit/test-util.c
@@ -341,7 +341,7 @@ unsigned short gsm_turkish_to_unicode_map[] =
 	((c) < 0x80 ? 1 : \
 	 ((c) < 0x800 ? 2 : 3))
 
-static void test_invalid()
+static void test_invalid(void)
 {
 	long nwritten;
 	long nread;
@@ -382,7 +382,7 @@ static void test_invalid()
 	g_assert(nread == 0);
 }
 
-static void test_valid()
+static void test_valid(void)
 {
 	long nwritten;
 	long nread;
@@ -444,7 +444,7 @@ static void test_valid()
 	}
 }
 
-static void test_valid_turkish()
+static void test_valid_turkish(void)
 {
 	long nwritten;
 	long nread;
@@ -515,7 +515,7 @@ static const char expected[] = "It is easy to read text messages via AT "
 				"commands.";
 static int reported_text_size = 49;
 
-static void test_decode_encode()
+static void test_decode_encode(void)
 {
 	const char *sms = hex_packed;
 	unsigned char *decoded, *packed;
@@ -614,7 +614,7 @@ static void test_decode_encode()
 	g_free(hex_packed);
 }
 
-static void test_pack_size()
+static void test_pack_size(void)
 {
 	unsigned char c1[] = { 'a' };
 	unsigned char c2[] = { 'a', 'b' };
@@ -676,7 +676,7 @@ static void test_pack_size()
 	g_free(packed);
 }
 
-static void test_cr_handling()
+static void test_cr_handling(void)
 {
 	unsigned char c7[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g' };
 	unsigned char c7_expected[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g',
@@ -739,7 +739,7 @@ static void test_cr_handling()
 	g_free(packed);
 }
 
-static void test_sms_handling()
+static void test_sms_handling(void)
 {
 	unsigned char c7[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g' };
 
@@ -780,7 +780,7 @@ static void test_sms_handling()
 	g_free(packed);
 }
 
-static void test_offset_handling()
+static void test_offset_handling(void)
 {
 	unsigned char c7[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g' };
 	unsigned char c8[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h' };
@@ -880,7 +880,7 @@ static unsigned char sim_82_1[] = { 0x82, 0x05, 0x04, 0x00, 0x2D, 0xB3, 0xB4,
 static unsigned char sim_82_2[] = { 0x82, 0x05, 0xD8, 0x00, 0x2D, 0xB3, 0xB4,
 					0x2D, 0x31 };
 
-static void test_sim()
+static void test_sim(void)
 {
 	char *utf8;
 
@@ -930,7 +930,7 @@ static void test_sim()
 	g_assert(utf8 == NULL);
 }
 
-static void test_unicode_to_gsm()
+static void test_unicode_to_gsm(void)
 {
 	long nwritten;
 	long nread;
-- 
1.7.0.4

[PATCH 16/16] gatchat: M15 coding styles fixes

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 2836 bytes --]

---
 gatchat/gatsyntax.c   |    4 ++--
 gatchat/gatsyntax.h   |    4 ++--
 gatchat/gsmdial.c     |    4 ++--
 gatchat/test-server.c |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gatchat/gatsyntax.c b/gatchat/gatsyntax.c
index f5a409b..2fc70b8 100644
--- a/gatchat/gatsyntax.c
+++ b/gatchat/gatsyntax.c
@@ -332,12 +332,12 @@ GAtSyntax *g_at_syntax_new_full(GAtSyntaxFeedFunc feed,
 }
 
 
-GAtSyntax *g_at_syntax_new_gsmv1()
+GAtSyntax *g_at_syntax_new_gsmv1(void)
 {
 	return g_at_syntax_new_full(gsmv1_feed, gsmv1_hint, GSMV1_STATE_IDLE);
 }
 
-GAtSyntax *g_at_syntax_new_gsm_permissive()
+GAtSyntax *g_at_syntax_new_gsm_permissive(void)
 {
 	return g_at_syntax_new_full(gsm_permissive_feed, gsm_permissive_hint,
 					GSM_PERMISSIVE_STATE_IDLE);
diff --git a/gatchat/gatsyntax.h b/gatchat/gatsyntax.h
index d76cf6f..afc0bd3 100644
--- a/gatchat/gatsyntax.h
+++ b/gatchat/gatsyntax.h
@@ -69,13 +69,13 @@ GAtSyntax *g_at_syntax_new_full(GAtSyntaxFeedFunc feed,
  * properly and can be used to detect a modem's deviations from the relevant
  * standards.
  */
-GAtSyntax *g_at_syntax_new_gsmv1();
+GAtSyntax *g_at_syntax_new_gsmv1(void);
 
 /* This syntax implements an extremely lax parser that can handle a variety
  * of modems.  Unfortunately it does not deal with echo at all, so echo must
  * be explicitly turned off before using the parser
  */
-GAtSyntax *g_at_syntax_new_gsm_permissive();
+GAtSyntax *g_at_syntax_new_gsm_permissive(void);
 
 GAtSyntax *g_at_syntax_ref(GAtSyntax *syntax);
 void g_at_syntax_unref(GAtSyntax *syntax);
diff --git a/gatchat/gsmdial.c b/gatchat/gsmdial.c
index 22ff2ff..1be80e3 100644
--- a/gatchat/gsmdial.c
+++ b/gatchat/gsmdial.c
@@ -509,7 +509,7 @@ static void check_mode(gboolean ok, GAtResult *result, gpointer user_data)
 	g_at_chat_send(control, "AT+CFUN=1", NULL, check_pin, NULL, NULL);
 }
 
-static int open_serial()
+static int open_serial(void)
 {
 	GAtSyntax *syntax;
 	GIOChannel *channel;
@@ -551,7 +551,7 @@ static int open_serial()
 	return 0;
 }
 
-static int open_ip()
+static int open_ip(void)
 {
 	int sk, err;
 	struct sockaddr_in addr;
diff --git a/gatchat/test-server.c b/gatchat/test-server.c
index cb451e9..ffe59d7 100644
--- a/gatchat/test-server.c
+++ b/gatchat/test-server.c
@@ -67,7 +67,7 @@ static GAtServer *server;
 static GAtPPP *ppp;
 unsigned int server_watch;
 
-static gboolean server_cleanup()
+static gboolean server_cleanup(void)
 {
 	if (server_watch)
 		g_source_remove(server_watch);
@@ -1090,7 +1090,7 @@ static gboolean signal_cb(GIOChannel *channel, GIOCondition cond, gpointer data)
 	return TRUE;
 }
 
-static int create_signal_io()
+static int create_signal_io(void)
 {
 	sigset_t mask;
 	GIOChannel *signal_io;
-- 
1.7.0.4

Re: [PATCH 00/16] M15 coding style fixes

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

Hi Jeevaka,

>  Coding style fix patches for the whole oFono tree.

thank you very much for doing this. All patches have been applied.

Regards

Marcel