Quellcode durchsuchen

Confparse: Add warning if a = is missing

Martin Duquesnoy vor 14 Jahren
Ursprung
Commit
e8213b2fe4
2 geänderte Dateien mit 9 neuen und 7 gelöschten Zeilen
  1. 5 7
      src/config.c
  2. 4 0
      src/confparse/confparse.c

+ 5 - 7
src/config.c

@@ -260,7 +260,7 @@ void
 conf_layout_section(char *src)
 {
      int i;
-     char *tmp = NULL;
+     char *tmp = NULL, *p;
 
      /* Set conf.layout NULL for conf reload */
      for(i = 0; i < NUM_OF_LAYOUT; ++i)
@@ -301,20 +301,18 @@ conf_layout_section(char *src)
                {
                     tmp = get_nsec(src, "layout", i);
 
-                    if(!name_to_func(get_opt(tmp, "tile", "type").str, layout_list))
+                    if(!name_to_func((p = get_opt(tmp, "tile", "type").str), layout_list))
                     {
-                         fprintf(stderr, "WMFS Configuration: Unknow Layout type: \"%s\"\n",
-                                 get_opt(tmp, "tile", "type").str);
+                         fprintf(stderr, "WMFS Configuration: Unknow Layout type: \"%s\"\n", p);
                     }
                     else
                     {
                          if(conf.layout_system && conf.nlayout > 1)
                               menu_new_item(&menulayout.item[i], get_opt(tmp, "", "symbol").str,
-                                            uicb_set_layout,
-                                            get_opt(tmp, "tile", "type").str);
+                                            uicb_set_layout, p);
 
                          conf.layout[i].symbol = get_opt(tmp, "TILE (default)", "symbol").str;
-                         conf.layout[i].func = name_to_func(get_opt(tmp, "tile", "type").str, layout_list);
+                         conf.layout[i].func = name_to_func(p, layout_list);
                     }
                }
           }

+ 4 - 0
src/confparse/confparse.c

@@ -174,7 +174,11 @@ get_opt(char *src, char *def, char *name)
                 * between option name and '=' */
                for(i = 0; i < strlen(p2); ++i)
                     if(p2[i] != ' ')
+                    {
+                         fprintf(stderr, "WMFS Configuration warning: Missing '=' after option: '%s'"
+                                   " and before expression: '%s'\n", name, p2);
                          return str_to_opt(def);
+                    }
 
                ret = str_to_opt(clean_value(++p));
           }