This one catches all the old-style definitions with ANSI-conformant
declarations, e.g.,
int foo(void);
...
int foo()
{
...
}
Due to -Wstrict-prototypes and -Wmissing-prototypes, we're already
reasonably sure that this can't cause trouble. But better safe than
sorry.
---
src/Makefile | 2 +-
src/config.c | 2 +-
src/fb.c | 10 +++++-----
src/gui/about.c | 4 ++--
src/gui/audio.c | 6 +++---
src/gui/cp.c | 6 +++---
src/gui/dmx.c | 6 +++---
src/gui/dmxdesk.c | 6 +++---
src/gui/dmxspy.c | 6 +++---
src/gui/filemanager.c | 4 ++--
src/gui/firstpatch.c | 4 ++--
src/gui/flash.c | 2 +-
src/gui/guirender.c | 2 +-
src/gui/ir.c | 4 ++--
src/gui/keyboard.c | 4 ++--
src/gui/messagebox.c | 2 +-
src/gui/midi.c | 4 ++--
src/gui/monitor.c | 6 +++---
src/gui/oscsettings.c | 4 ++--
src/gui/patcheditor.c | 4 ++--
src/gui/performance.c | 4 ++--
src/gui/rsswall.c | 8 ++++----
src/gui/shutdown.c | 4 ++--
src/gui/sysettings.c | 8 ++++----
src/gui/videoin.c | 6 +++---
src/input.c | 2 +-
src/osc.c | 2 +-
src/sysconfig.c | 18 +++++++++---------
28 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index d0d8a1f..b959313 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,7 +28,7 @@ else
endif
CFLAGS = -O9 -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wold-style-declaration \
+ -Wold-style-declaration -Wold-style-definition \
-mbarrel-shift-enabled -mmultiply-enabled \
-mdivide-enabled -msign-extend-enabled -fsingle-precision-constant \
-I$(RTEMS_MAKEFILE_PATH)/lib/include -g
diff --git a/src/config.c b/src/config.c
index a9e4dc4..7d6085a 100644
--- a/src/config.c
+++ b/src/config.c
@@ -146,7 +146,7 @@ void config_delete(const char *key)
free(e);
}
-void config_free()
+void config_free(void)
{
struct element *e, *next;
diff --git a/src/fb.c b/src/fb.c
index 43e59c5..98478cd 100644
--- a/src/fb.c
+++ b/src/fb.c
@@ -90,7 +90,7 @@ void init_fb_mtk(int quiet)
}
}
-void fb_unblank()
+void fb_unblank(void)
{
if(blanked) {
set_mode(sysconfig_get_resolution());
@@ -101,7 +101,7 @@ void fb_unblank()
}
}
-void fb_render_mode()
+void fb_render_mode(void)
{
set_mode(SC_RESOLUTION_640_480);
ioctl(framebuffer_fd, FBIOSETBUFFERMODE, FB_TRIPLE_BUFFERED);
@@ -109,7 +109,7 @@ void fb_render_mode()
g_render_mode = 1;
}
-void fb_gui_mode()
+void fb_gui_mode(void)
{
set_mode(sysconfig_get_resolution());
ioctl(framebuffer_fd, FBIOSETBUFFERMODE, FB_SINGLE_BUFFERED);
@@ -117,12 +117,12 @@ void fb_gui_mode()
g_render_mode = 0;
}
-int fb_get_mode()
+int fb_get_mode(void)
{
return g_render_mode;
}
-void fb_resize_gui()
+void fb_resize_gui(void)
{
struct fb_fix_screeninfo fb_fix;
int mode, hres, vres;
diff --git a/src/gui/about.c b/src/gui/about.c
index dc99131..34d5fb9 100644
--- a/src/gui/about.c
+++ b/src/gui/about.c
@@ -37,7 +37,7 @@ static void flash_callback(mtk_event *e, void *arg)
#define FLASH_OFFSET_MAC_ADDRESS (0x002200E0)
-void init_about()
+void init_about(void)
{
unsigned char *macadr = (unsigned char *)FLASH_OFFSET_MAC_ADDRESS;
@@ -93,7 +93,7 @@ void init_about()
mtk_bind(appid, "w", "close", close_callback, NULL);
}
-void open_about_window()
+void open_about_window(void)
{
mtk_cmd(appid, "w.open()");
}
diff --git a/src/gui/audio.c b/src/gui/audio.c
index 6a6b960..d2629c2 100644
--- a/src/gui/audio.c
+++ b/src/gui/audio.c
@@ -87,7 +87,7 @@ static void mute_callback(mtk_event *e, void *arg)
}
}
-void load_audio_config()
+void load_audio_config(void)
{
line_vol = config_read_int("line_vol", 100);
line_mute = config_read_int("line_mute", 0);
@@ -134,7 +134,7 @@ static void close_callback(mtk_event *e, void *arg)
load_audio_config();
}
-void init_audio()
+void init_audio(void)
{
appid = mtk_init_app("Audio");
@@ -193,7 +193,7 @@ void init_audio()
load_audio_config();
}
-void open_audio_window()
+void open_audio_window(void)
{
if(w_open) return;
w_open = 1;
diff --git a/src/gui/cp.c b/src/gui/cp.c
index 2f26621..7564be4 100644
--- a/src/gui/cp.c
+++ b/src/gui/cp.c
@@ -54,7 +54,7 @@ static struct filedialog *save_dlg;
static int changed;
-void cp_notify_changed()
+void cp_notify_changed(void)
{
if(changed) return;
changed = 1;
@@ -207,7 +207,7 @@ static void cp_callback(mtk_event *e, void *arg)
}
}
-void init_cp()
+void init_cp(void)
{
appid = mtk_init_app("Control panel");
@@ -363,7 +363,7 @@ void init_cp()
save_dlg = create_filedialog("Save performance", 1, "per",
saveok_callback, NULL, NULL, NULL);
}
-void cp_autostart()
+void cp_autostart(void)
{
char autostart[256];
int dt, as;
diff --git a/src/gui/dmx.c b/src/gui/dmx.c
index ff02615..280c393 100644
--- a/src/gui/dmx.c
+++ b/src/gui/dmx.c
@@ -64,7 +64,7 @@ static void set_chain_mode(int chain)
resmgr_release(RESOURCE_DMX_OUT);
}
-void load_dmx_config()
+void load_dmx_config(void)
{
int i, value;
char confname[12];
@@ -142,7 +142,7 @@ static void close_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "w.close()");
}
-void init_dmx()
+void init_dmx(void)
{
int i;
@@ -212,7 +212,7 @@ void init_dmx()
set_chain_mode(1);
}
-void open_dmx_window()
+void open_dmx_window(void)
{
if(w_open) return;
w_open = 1;
diff --git a/src/gui/dmxdesk.c b/src/gui/dmxdesk.c
index 5cd43cb..da99616 100644
--- a/src/gui/dmxdesk.c
+++ b/src/gui/dmxdesk.c
@@ -82,7 +82,7 @@ static void close_callback(mtk_event *e, void *arg)
close_dmxdesk_window();
}
-void init_dmxdesk()
+void init_dmxdesk(void)
{
int i;
@@ -115,7 +115,7 @@ void init_dmxdesk()
static int w_open;
-void open_dmxdesk_window()
+void open_dmxdesk_window(void)
{
if(w_open) return;
w_open = 1;
@@ -131,7 +131,7 @@ void open_dmxdesk_window()
mtk_cmd(appid, "w.open()");
}
-void close_dmxdesk_window()
+void close_dmxdesk_window(void)
{
if(!w_open) return;
w_open = 0;
diff --git a/src/gui/dmxspy.c b/src/gui/dmxspy.c
index e04dc42..d3d20a1 100644
--- a/src/gui/dmxspy.c
+++ b/src/gui/dmxspy.c
@@ -76,7 +76,7 @@ static void close_callback(mtk_event *e, void *arg)
close_dmxspy_window();
}
-void init_dmxspy()
+void init_dmxspy(void)
{
appid = mtk_init_app("DMX spy");
@@ -100,7 +100,7 @@ void init_dmxspy()
}
-void open_dmxspy_window()
+void open_dmxspy_window(void)
{
if(w_open) return;
if(!resmgr_acquire("DMX spy", RESOURCE_DMX_IN)) return;
@@ -117,7 +117,7 @@ void open_dmxspy_window()
input_add_callback(dmxspy_update);
}
-void close_dmxspy_window()
+void close_dmxspy_window(void)
{
mtk_cmd(appid, "w.close()");
input_delete_callback(dmxspy_update);
diff --git a/src/gui/filemanager.c b/src/gui/filemanager.c
index fb4bc65..ed98e85 100644
--- a/src/gui/filemanager.c
+++ b/src/gui/filemanager.c
@@ -286,7 +286,7 @@ static void unlock_callback(mtk_event *e, void *arg)
unlock++;
}
-void init_filemanager()
+void init_filemanager(void)
{
appid = mtk_init_app("File manager");
@@ -466,7 +466,7 @@ static void display_folder(int panel, const char *folder)
mtk_cmdf(appid, "p%d_listf.expose(0, 0)", panel);
}
-void open_filemanager_window()
+void open_filemanager_window(void)
{
unlock = 0;
display_folder(0, ROOT_FOLDER);
diff --git a/src/gui/firstpatch.c b/src/gui/firstpatch.c
index 2f6dc5a..1570cdb 100644
--- a/src/gui/firstpatch.c
+++ b/src/gui/firstpatch.c
@@ -62,7 +62,7 @@ static void browse_ok_callback(void *arg)
mtk_cmdf(appid, "e_filename.set(-text \"%s\")", filename);
}
-void init_firstpatch()
+void init_firstpatch(void)
{
appid = mtk_init_app("First patch");
@@ -102,7 +102,7 @@ void init_firstpatch()
browse_dlg = create_filedialog("Select first patch", 0, "fnp",
browse_ok_callback, NULL, NULL, NULL);
}
-void open_firstpatch_window()
+void open_firstpatch_window(void)
{
const char *firstpatch;
diff --git a/src/gui/flash.c b/src/gui/flash.c
index 9ec9c01..41186c2 100644
--- a/src/gui/flash.c
+++ b/src/gui/flash.c
@@ -761,7 +761,7 @@ static void opendialog_callback(mtk_event *e, void *arg)
open_filedialog(file_dlg);
}
-void init_flash()
+void init_flash(void)
{
appid = mtk_init_app("Flash");
diff --git a/src/gui/guirender.c b/src/gui/guirender.c
index e91982a..92e4f33 100644
--- a/src/gui/guirender.c
+++ b/src/gui/guirender.c
@@ -53,7 +53,7 @@ static void input_cb(mtk_event *e, int count);
static int guirender_running;
static guirender_stop_callback callback;
-void guirender_stop()
+void guirender_stop(void)
{
if(!guirender_running) return;
guirender_running = 0;
diff --git a/src/gui/ir.c b/src/gui/ir.c
index facfc2c..f08eaa2 100644
--- a/src/gui/ir.c
+++ b/src/gui/ir.c
@@ -261,7 +261,7 @@ static void autobuild_callback(mtk_event *e, void *arg)
update_list();
}
-void init_ir()
+void init_ir(void)
{
appid = mtk_init_app("IR remote control settings");
@@ -340,7 +340,7 @@ void init_ir()
browse_dlg = create_filedialog("Select IR patch", 0, "fnp",
browse_ok_callback, NULL, NULL, NULL);
}
-void open_ir_window()
+void open_ir_window(void)
{
if(w_open) return;
w_open = 1;
diff --git a/src/gui/keyboard.c b/src/gui/keyboard.c
index 409f16c..f5329d2 100644
--- a/src/gui/keyboard.c
+++ b/src/gui/keyboard.c
@@ -243,7 +243,7 @@ static void autobuild_callback(mtk_event *e, void *arg)
update_list();
}
-void init_keyboard()
+void init_keyboard(void)
{
appid = mtk_init_app("Keyboard");
@@ -322,7 +322,7 @@ void init_keyboard()
browse_dlg = create_filedialog("Select keyboard patch", 0, "fnp",
browse_ok_callback, NULL, NULL, NULL);
}
-void open_keyboard_window()
+void open_keyboard_window(void)
{
if(w_open) return;
w_open = 1;
diff --git a/src/gui/messagebox.c b/src/gui/messagebox.c
index 8c21ba4..a8fb780 100644
--- a/src/gui/messagebox.c
+++ b/src/gui/messagebox.c
@@ -28,7 +28,7 @@ static void close_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "w.close()");
}
-void init_messagebox()
+void init_messagebox(void)
{
appid = mtk_init_app("Messagebox");
mtk_cmd_seq(appid,
diff --git a/src/gui/midi.c b/src/gui/midi.c
index f5a0536..a1029f1 100644
--- a/src/gui/midi.c
+++ b/src/gui/midi.c
@@ -434,7 +434,7 @@ static void autobuild_callback(mtk_event *e, void *arg)
update_list();
}
-void init_midi()
+void init_midi(void)
{
int i;
@@ -571,7 +571,7 @@ void init_midi()
browse_dlg = create_filedialog("Select MIDI patch", 0, "fnp",
browse_ok_callback, NULL, NULL, NULL);
}
-void open_midi_window()
+void open_midi_window(void)
{
if(w_open) return;
w_open = 1;
diff --git a/src/gui/monitor.c b/src/gui/monitor.c
index cd29f36..6bc8c9f 100644
--- a/src/gui/monitor.c
+++ b/src/gui/monitor.c
@@ -134,7 +134,7 @@ static void close_callback(mtk_event *e, void *arg)
w_open = 0;
}
-void init_monitor()
+void init_monitor(void)
{
int i;
int column;
@@ -167,7 +167,7 @@ void init_monitor()
mtk_bind(appid, "w", "close", close_callback, NULL);
}
-void open_monitor_window()
+void open_monitor_window(void)
{
if(w_open) return;
@@ -186,7 +186,7 @@ void open_monitor_window()
sampler_start(sampler_callback);
}
-void monitor_notify_changed()
+void monitor_notify_changed(void)
{
if(!w_open) return;
sampler_stop();
diff --git a/src/gui/oscsettings.c b/src/gui/oscsettings.c
index edc0e17..aa0db3f 100644
--- a/src/gui/oscsettings.c
+++ b/src/gui/oscsettings.c
@@ -246,7 +246,7 @@ static void autobuild_callback(mtk_event *e, void *arg)
update_list();
}
-void init_oscsettings()
+void init_oscsettings(void)
{
appid = mtk_init_app("OSC");
@@ -323,7 +323,7 @@ void init_oscsettings()
browse_dlg = create_filedialog("OSC patch select", 0, "fnp",
browse_ok_callback, NULL, NULL, NULL);
}
-void open_oscsettings_window()
+void open_oscsettings_window(void)
{
if(w_open) return;
w_open = 1;
diff --git a/src/gui/patcheditor.c b/src/gui/patcheditor.c
index 0b730e0..c7a9338 100644
--- a/src/gui/patcheditor.c
+++ b/src/gui/patcheditor.c
@@ -185,7 +185,7 @@ static void accel_callback(mtk_event *e, void *arg)
static void close_callback(mtk_event *e, void *arg);
-void init_patcheditor()
+void init_patcheditor(void)
{
appid = mtk_init_app("Patch editor");
mtk_cmd_seq(appid,
@@ -239,7 +239,7 @@ static void close_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "w.close()");
}
-void open_patcheditor_window()
+void open_patcheditor_window(void)
{
if(w_open) return;
w_open = 1;
diff --git a/src/gui/performance.c b/src/gui/performance.c
index 407bdb5..26bd120 100644
--- a/src/gui/performance.c
+++ b/src/gui/performance.c
@@ -222,7 +222,7 @@ static void go_callback(mtk_event *e, void *arg)
start_performance(simple_mode, dt_mode, as_mode);
}
-void init_performance()
+void init_performance(void)
{
appid = mtk_init_app("Performance");
@@ -522,7 +522,7 @@ static void refresh_callback(mtk_event *e, int count)
}
}
-void open_performance_window()
+void open_performance_window(void)
{
update_buttons();
mtk_cmd(appid, "w.open()");
diff --git a/src/gui/rsswall.c b/src/gui/rsswall.c
index 6518858..6504897 100644
--- a/src/gui/rsswall.c
+++ b/src/gui/rsswall.c
@@ -104,7 +104,7 @@ static void clearidle_callback(mtk_event *e, void *arg)
mtk_cmd(appid, "e_idle.set(-text \"\")");
}
-void init_rsswall()
+void init_rsswall(void)
{
appid = mtk_init_app("RSS wall");
@@ -168,7 +168,7 @@ void init_rsswall()
mtk_bind(appid, "w", "close", cancel_callback, NULL);
}
-void open_rsswall_window()
+void open_rsswall_window(void)
{
if(w_open) return;
w_open = 1;
@@ -335,7 +335,7 @@ static rtems_task rsswall_task(rtems_task_argument argument)
rtems_task_delete(RTEMS_SELF);
}
-void rsswall_start()
+void rsswall_start(void)
{
rtems_status_code sc;
@@ -369,7 +369,7 @@ void rsswall_start()
rsswall_running = 1;
}
-void rsswall_stop()
+void rsswall_stop(void)
{
if(!rsswall_running) return;
rtems_event_send(rsswall_task_id, RTEMS_EVENT_1);
diff --git a/src/gui/shutdown.c b/src/gui/shutdown.c
index 67f09af..f558dd0 100644
--- a/src/gui/shutdown.c
+++ b/src/gui/shutdown.c
@@ -44,7 +44,7 @@ static void shutdown_callback(mtk_event *e, void *arg)
clean_shutdown(turnoff);
}
-void init_shutdown()
+void init_shutdown(void)
{
appid = mtk_init_app("Shutdown");
mtk_cmd_seq(appid,
@@ -67,7 +67,7 @@ void init_shutdown()
mtk_bind(appid, "w", "close", cancel_callback, NULL);
}
-void open_shutdown_window()
+void open_shutdown_window(void)
{
mtk_cmd(appid, "w.open()");
}
diff --git a/src/gui/sysettings.c b/src/gui/sysettings.c
index 0a783b1..5b3f5ab 100644
--- a/src/gui/sysettings.c
+++ b/src/gui/sysettings.c
@@ -135,7 +135,7 @@ static void clear_wallpaper_callback(mtk_event *e, void
*arg)
mtk_cmd(appid, "e_wallpaper.set(-text \"\")");
}
-void init_sysettings()
+void init_sysettings(void)
{
appid = mtk_init_app("System settings");
@@ -332,7 +332,7 @@ void init_sysettings()
browse_autostart_dlg = create_filedialog("Select autostart
performance", 0, "per", autostart_ok_callback, NULL, NULL, NULL);
}
-void sysettings_update_resolution()
+void sysettings_update_resolution(void)
{
int resolution;
@@ -373,7 +373,7 @@ static void update_layout(void)
mtk_cmdf(appid, "b_kbd_german.set(-state %s)", layout ==
SC_KEYBOARD_LAYOUT_GERMAN ? "on" : "off");
}
-static void update_network()
+static void update_network(void)
{
int dhcp_enable;
unsigned int ip;
@@ -477,7 +477,7 @@ static int previous_layout;
static int previous_dhcp;
static unsigned int previous_ip, previous_netmask, previous_gateway,
previous_dns1, previous_dns2;
-void open_sysettings_window()
+void open_sysettings_window(void)
{
if(w_open) return;
w_open = 1;
diff --git a/src/gui/videoin.c b/src/gui/videoin.c
index cb7297f..f008e9b 100644
--- a/src/gui/videoin.c
+++ b/src/gui/videoin.c
@@ -114,7 +114,7 @@ static void format_callback(mtk_event *e, void *arg)
set_format((int)arg);
}
-void load_videoin_config()
+void load_videoin_config(void)
{
set_format(config_read_int("vin_format", VIDEO_FORMAT_CVBS6));
@@ -204,7 +204,7 @@ static void close_callback(mtk_event *e, void *arg)
close_videoin_window();
}
-void init_videoin()
+void init_videoin(void)
{
appid = mtk_init_app("Video in");
@@ -308,7 +308,7 @@ void init_videoin()
mtk_bind(appid, "w", "close", close_callback, NULL);
}
-void open_videoin_window()
+void open_videoin_window(void)
{
if(w_open) return;
diff --git a/src/input.c b/src/input.c
index 63d8a94..8f2541e 100644
--- a/src/input.c
+++ b/src/input.c
@@ -373,7 +373,7 @@ void input_delete_callback(input_callback cb)
/* The maximum number of mtk_events that can be generated out of a single
message on input_q */
#define WORST_CASE_EVENTS 20
-void input_eventloop()
+void input_eventloop(void)
{
mtk_event e[MAX_EVENTS];
int total, n;
diff --git a/src/osc.c b/src/osc.c
index de5cfb3..e03da96 100644
--- a/src/osc.c
+++ b/src/osc.c
@@ -160,7 +160,7 @@ static rtems_task osc_task(rtems_task_argument argument)
static rtems_id osc_task_id;
-void init_osc()
+void init_osc(void)
{
rtems_status_code sc;
diff --git a/src/sysconfig.c b/src/sysconfig.c
index ba7f664..3b6356b 100644
--- a/src/sysconfig.c
+++ b/src/sysconfig.c
@@ -166,7 +166,7 @@ static void sysconfig_credentials_lock_init(void);
static void sysconfig_credentials_lock(void);
static void sysconfig_credentials_unlock(void);
-int sysconfig_is_rescue()
+int sysconfig_is_rescue(void)
{
const char *bsp_cmdline;
@@ -178,7 +178,7 @@ int sysconfig_is_rescue()
static void start_dhcp_task(void);
-void sysconfig_load()
+void sysconfig_load(void)
{
struct sysconfig conf;
@@ -216,7 +216,7 @@ void sysconfig_load()
}
}
-void sysconfig_save()
+void sysconfig_save(void)
{
FILE *fd;
@@ -334,7 +334,7 @@ static void route_set_gateway(unsigned int ip)
/* get */
-int sysconfig_get_resolution()
+int sysconfig_get_resolution(void)
{
return sysconfig.resolution;
}
@@ -344,12 +344,12 @@ void sysconfig_get_wallpaper(char *wallpaper)
strcpy(wallpaper, sysconfig.wallpaper);
}
-int sysconfig_get_language()
+int sysconfig_get_language(void)
{
return sysconfig.language;
}
-int sysconfig_get_keyboard_layout()
+int sysconfig_get_keyboard_layout(void)
{
return sysconfig.keyboard_layout;
}
@@ -376,7 +376,7 @@ void sysconfig_get_credentials(char *login, char *password)
strcpy(password, sysconfig.password);
}
-int sysconfig_get_autostart_mode()
+int sysconfig_get_autostart_mode(void)
{
return sysconfig.autostart_mode;
}
@@ -405,7 +405,7 @@ void sysconfig_set_resolution(int resolution)
fb_resize_gui();
}
-void sysconfig_set_mtk_wallpaper()
+void sysconfig_set_mtk_wallpaper(void)
{
struct pixbuf *p;
@@ -439,7 +439,7 @@ void sysconfig_set_language(int language)
sysconfig_set_mtk_language();
}
-void sysconfig_set_mtk_language()
+void sysconfig_set_mtk_language(void)
{
switch(sysconfig.language) {
case SC_LANGUAGE_FRENCH:
--
1.7.1
_______________________________________________
http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org
IRC: #milkymist@Freenode
