[asterisk-commits] branch russell/menuselect_buildoptions r34349 - in /team/russell/menuselect_b...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Jun 15 18:41:37 2006
New Revision: 34349

URL: http://svn.digium.com/view/asterisk?rev=34349&view=rev
Log:
Merged revisions 34348 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r34348 | russell | 2006-06-15 19:40:55 -0400 (Thu, 15 Jun 2006) | 3 lines

remove prototypes for private functions and make functions and variables not
used outside of this file static

........

Modified:
    team/russell/menuselect_buildoptions/   (props changed)
    team/russell/menuselect_buildoptions/build_tools/menuselect_curses.c

Propchange: team/russell/menuselect_buildoptions/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 15 18:41:37 2006
@@ -1,1 +1,1 @@
-/trunk:1-34343
+/trunk:1-34348

Modified: team/russell/menuselect_buildoptions/build_tools/menuselect_curses.c
URL: http://svn.digium.com/view/asterisk/team/russell/menuselect_buildoptions/build_tools/menuselect_curses.c?rev=34349&r1=34348&r2=34349&view=diff
==============================================================================
--- team/russell/menuselect_buildoptions/build_tools/menuselect_curses.c (original)
+++ team/russell/menuselect_buildoptions/build_tools/menuselect_curses.c Thu Jun 15 18:41:37 2006
@@ -48,11 +48,11 @@
 
 
 /*! Maximum number of characters horizontally */
-int max_x = 0;
+static int max_x = 0;
 /*! Maximum number of characters vertically */
-int max_y = 0;
-
-const char * const help_info[] = {
+static int max_y = 0;
+
+static const char * const help_info[] = {
 	"scroll        => up/down arrows",
 	"(de)select    => Enter",
 	"select all    => F8",
@@ -64,16 +64,8 @@
 	"XXX means dependencies have not been met"
 };
 
-void winch_handler(int sig);
-void show_help(WINDOW *win);
-void draw_main_menu(WINDOW *menu, int curopt);
-void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end, int curopt, int changed);
-int run_category_menu(WINDOW *menu, int cat_num);
-int run_category_menu(WINDOW *menu, int cat_num);
-void draw_title_window(WINDOW *title);
-
 /*! \brief Handle a window resize in xterm */
-void winch_handler(int sig)
+static void winch_handler(int sig)
 {
 	getmaxyx(stdscr, max_y, max_x);
 
@@ -85,7 +77,7 @@
 }
 
 /*! \brief Display help information */
-void show_help(WINDOW *win)
+static void show_help(WINDOW *win)
 {
 	int i;
 
@@ -98,7 +90,7 @@
 	getch(); /* display the help until the user hits a key */
 }
 
-void draw_main_menu(WINDOW *menu, int curopt)
+static void draw_main_menu(WINDOW *menu, int curopt)
 {
 	struct category *cat;
 	char buf[64];
@@ -122,7 +114,7 @@
 	wrefresh(menu);
 }
 
-void display_mem_info(WINDOW *menu, struct member *mem, int start, int end)
+static void display_mem_info(WINDOW *menu, struct member *mem, int start, int end)
 {
 	char buf[64];
 	struct depend *dep;
@@ -162,7 +154,7 @@
 
 }
 
-void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end, int curopt, int changed)
+static void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end, int curopt, int changed)
 {
 	int i = 0;
 	int j = 0;
@@ -212,7 +204,7 @@
 	wrefresh(menu);
 }
 
-int run_category_menu(WINDOW *menu, int cat_num)
+static int run_category_menu(WINDOW *menu, int cat_num)
 {
 	struct category *cat;
 	int i = 0;
@@ -298,7 +290,7 @@
 	return c;
 }
 
-void draw_title_window(WINDOW *title)
+static void draw_title_window(WINDOW *title)
 {
 	wmove(title, 1, (max_x / 2) - (strlen(MENU_TITLE1) / 2));
 	waddstr(title, MENU_TITLE1);