[MPlayer-cvslog] r34649 - in trunk/gui: cfg.c cfg.h win32/wincfg.c

[ib]

Author: ib
Date: Fri Feb  3 14:57:10 2012
New Revision: 34649

Log:
Make cfg_read() and cfg_write() void functions.

There is no error handling other than instantly exiting MPlayer
and the return values aren't used anywhere.

Modified:
   trunk/gui/cfg.c
   trunk/gui/cfg.h
   trunk/gui/win32/wincfg.c

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Fri Feb  3 14:38:42 2012	(r34648)
+++ trunk/gui/cfg.c	Fri Feb  3 14:57:10 2012	(r34649)
@@ -230,7 +230,7 @@ int cfg_gui_include(m_option_t *conf, co
     return m_config_parse_config_file(gui_conf, filename, 0);
 }
 
-int cfg_read(void)
+void cfg_read(void)
 {
     char *cfg;
     FILE *f;
@@ -328,11 +328,9 @@ int cfg_read(void)
     }
 
     free(cfg);
-
-    return 0;
 }
 
-int cfg_write(void)
+void cfg_write(void)
 {
     char *cfg;
     FILE *f;
@@ -420,6 +418,4 @@ int cfg_write(void)
     }
 
     free(cfg);
-
-    return 0;
 }

Modified: trunk/gui/cfg.h
==============================================================================
--- trunk/gui/cfg.h	Fri Feb  3 14:38:42 2012	(r34648)
+++ trunk/gui/cfg.h	Fri Feb  3 14:57:10 2012	(r34649)
@@ -90,7 +90,7 @@ extern char *skinName;
 extern char *fsHistory[5];
 
 int cfg_gui_include(m_option_t *conf, const char *filename);
-int cfg_read(void);
-int cfg_write(void);
+void cfg_read(void);
+void cfg_write(void);
 
 #endif /* MPLAYER_GUI_CFG_H */

Modified: trunk/gui/win32/wincfg.c
==============================================================================
--- trunk/gui/win32/wincfg.c	Fri Feb  3 14:38:42 2012	(r34648)
+++ trunk/gui/win32/wincfg.c	Fri Feb  3 14:57:10 2012	(r34649)
@@ -93,7 +93,7 @@ int cfg_gui_include(m_option_t *conf, co
     return m_config_parse_config_file(gui_conf, filename, 0);
 }
 
-int cfg_read(void)
+void cfg_read(void)
 {
     char *cfg = get_path("gui.conf");
 
@@ -106,10 +106,9 @@ int cfg_read(void)
     if (m_config_parse_config_file(gui_conf, cfg, 1) < 0)
         mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_ConfigFileError);
     free(cfg);
-    return 0;
 }
 
-int cfg_write(void)
+void cfg_write(void)
 {
     char *cfg = get_path("gui.conf");
     FILE *f;
@@ -134,5 +133,4 @@ int cfg_write(void)
         fclose(f);
     }
     free(cfg);
-    return 0;
 }