simplify the loop that iterates through the categories in followme.conf and
authorRussell Bryant <russell@russellbryant.com>
Wed, 7 Jun 2006 20:02:07 +0000 (20:02 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 7 Jun 2006 20:02:07 +0000 (20:02 +0000)
don't try to read the general section as a followme profile

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32878 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_followme.c

index 5b6a8f1..d0a8d3c 100644 (file)
@@ -279,7 +279,7 @@ static int reload_followme(void)
 {
        struct ast_call_followme *f;
        struct ast_config *cfg;
-       char *cat, *tmp;
+       char *cat = NULL, *tmp;
        struct ast_variable *var;
        struct number *cur, *nm;
        int new, idx;
@@ -346,8 +346,9 @@ static int reload_followme(void)
                ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
 
        /* Chug through config file */
-       cat = ast_category_browse(cfg, NULL);
-       while(cat) {
+       while ((cat = ast_category_browse(cfg, cat))) {
+               if (!strcasecmp(cat, "general"))
+                       continue;
                /* Define a new profile */
                /* Look for an existing one */
                AST_LIST_TRAVERSE(&followmes, f, entry) {
@@ -416,7 +417,6 @@ static int reload_followme(void)
                                AST_LIST_INSERT_HEAD(&followmes, f, entry);
                        }
                }
-               cat = ast_category_browse(cfg, cat);
        }
        ast_config_destroy(cfg);