provide a correct return value in case everything goes well,

so you won't get random failures running menuselect.

Detected by -Wall -Werror

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

diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index b3400ffb82c10c3b2068f51cc8e33c2196cfdec4..9705af7fdc6848c3da7344f6afcb58362d5fc784 100644 (file)
--- a/build_tools/menuselect.c
+++ b/build_tools/menuselect.c
@@ -633,6 +633,7 @@ static int sanity_check(void)
                        }
                }
        }
+       return 0;       /* all good... */
 }
 
 /* \brief Set the forced default values if they exist */
@@ -725,5 +726,6 @@ int main(int argc, char *argv[])
        if (force_clean)
                unlink(".lastclean");
 
+       fprintf(stderr, "\nmenuselect about to exit with res %d\n", res);
        exit(res);
 }

diff --git a/build_tools/menuselect_curses.c b/build_tools/menuselect_curses.c
index 13fc86eb5eb0f27d8d1570777f3fdb5e4298d21d..d8bedc2024bdd8b0a7348f794cee3d471eba032f 100644 (file)
--- a/build_tools/menuselect_curses.c
+++ b/build_tools/menuselect_curses.c
@@ -128,7 +128,7 @@ void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end,
        int j = 0;
        struct member *mem;
        char buf[64];
-       char *desc = NULL;
+       const char *desc = NULL;
 
        wclear(menu);