sync up, minor fixes

1 files changed, 17 insertions, 18 deletions

diff --git a/parseconfig.h b/parseconfig.h
index 2908d9a..12fd5a7 100644
--- a/parseconfig.h
+++ b/parseconfig.h
@@ -18,14 +18,15 @@ struct cfg_cmdline {
     int                yesno:1;
 };
 void   cfg_parse_cmdline(int *argc, char **argv, struct cfg_cmdline *opt);
-void   cfg_help_cmdline(struct cfg_cmdline *opt, int w1, int w2, int w3);
+void   cfg_help_cmdline(FILE *fp, struct cfg_cmdline *opt, int w1, int w2, int w3);
 
 /* file I/O */
 int    cfg_parse_file(char *dname, char *filename);
 int    cfg_write_file(char *dname, char *filename);
 
 /* update */
-void   cfg_set_str(char *dname, char *sname, char *ename, const char *value);
+void   cfg_set_str(char *dname, char *sname, char *ename,
+		   const char *value);
 void   cfg_set_int(char *dname, char *sname, char *ename, int value);
 void   cfg_set_bool(char *dname, char *sname, char *ename, int value);
 
@@ -36,14 +37,14 @@ void   cfg_del_entry(char *dname, char *sname, char *ename);
 char*  cfg_sections_first(char *dname);
 char*  cfg_sections_next(char *dname, char *current);
 char*  cfg_sections_prev(char *dname, char *current);
-int    cfg_sections_count(char *dname);
 char*  cfg_sections_index(char *dname, int i);
+unsigned int cfg_sections_count(char *dname);
 
 char*  cfg_entries_first(char *dname, char *sname);
 char*  cfg_entries_next(char *dname, char *sname, char *current);
 char*  cfg_entries_prev(char *dname, char *sname, char *current);
-int    cfg_entries_count(char *dname, char *sname);
 char*  cfg_entries_index(char *dname, char *sname, int i);
+unsigned int cfg_entries_count(char *dname, char *sname);
 
 #define cfg_sections_for_each(dname, item) \
 	for (item = cfg_sections_first(dname); NULL != item; \
@@ -53,18 +54,16 @@ char*  cfg_search(char *dname, char *sname, char *ename, char *value);
 
 /* read */
 char*  cfg_get_str(char *dname, char *sname, char *ename);
-int    cfg_get_int(char *dname, char *sname, char *ename,
-		   int def);
-int    cfg_get_signed_int(char *dname, char *sname, char *ename,
-			  unsigned int def);
-float  cfg_get_float(char *dname, char *sname, char *ename,
-		     float def);
-int    cfg_get_bool(char *dname, char *sname, char *ename,
-		    int def);
+unsigned int cfg_get_int(char *dname, char *sname,
+			 char *ename, unsigned int def);
+signed int  cfg_get_signed_int(char *dname, char *sname,
+			       char *ename, signed int def);
+float  cfg_get_float(char *dname, char *sname, char *ename, float def);
+int    cfg_get_bool(char *dname, char *sname, char *ename, int def);
 
-int    cfg_get_sflags(char *dname, char *sname);
-int    cfg_get_eflags(char *dname, char *sname, char *ename);
-int    cfg_set_sflags(char *dname, char *sname,
-		      unsigned int mask, unsigned int bits);
-int    cfg_set_eflags(char *dname, char *sname, char *ename,
-		      unsigned int mask, unsigned int bits);
+unsigned int    cfg_get_sflags(char *dname, char *sname);
+unsigned int    cfg_get_eflags(char *dname, char *sname, char *ename);
+unsigned int    cfg_set_sflags(char *dname, char *sname,
+			       unsigned int mask, unsigned int bits);
+unsigned int    cfg_set_eflags(char *dname, char *sname, char *ename,
+			       unsigned int mask, unsigned int bits);