[svn-commits] branch russell/menuselect_buildoptions r34129 - /team/russell/menuselect_buil...

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Jun 14 10:31:27 2006
New Revision: 34129

URL: http://svn.digium.com/view/asterisk?rev=34129&view=rev
Log:
fix up interface changes ...

Modified:
    team/russell/menuselect_buildoptions/build_tools/menuselect.c
    team/russell/menuselect_buildoptions/build_tools/menuselect_curses.c

Modified: team/russell/menuselect_buildoptions/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/russell/menuselect_buildoptions/build_tools/menuselect.c?rev=34129&r1=34128&r2=34129&view=diff
==============================================================================
--- team/russell/menuselect_buildoptions/build_tools/menuselect.c (original)
+++ team/russell/menuselect_buildoptions/build_tools/menuselect.c Wed Jun 14 10:31:27 2006
@@ -412,15 +412,15 @@
 	int i = 0;
 
 	AST_LIST_TRAVERSE(&cat->members, mem, list) {
+		if (i++ == index)
+			break;
 		AST_LIST_TRAVERSE(&mem->buildopts, bop, list) {
 			if (i++ == index) {
 				mem = NULL;
 				break;
 			}
 		}
-		if (!mem)
-			break;
-		else if (i++ == index)
+		if (bop)
 			break;
 	}
 

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=34129&r1=34128&r2=34129&view=diff
==============================================================================
--- team/russell/menuselect_buildoptions/build_tools/menuselect_curses.c (original)
+++ team/russell/menuselect_buildoptions/build_tools/menuselect_curses.c Wed Jun 14 10:31:27 2006
@@ -200,7 +200,8 @@
 		waddstr(menu, buf);
 
 		AST_LIST_TRAVERSE(&mem->buildopts, bop, list) {
-			memnum++;
+			if (memnum++ == end)
+				break;
 			snprintf(buf, sizeof(buf), "        <%s> %s", bop->enabled ? "*" : " ", bop->name);
 			wmove(menu, linenum++, max_x / 2 - 10);
 			waddstr(menu, buf);
@@ -211,7 +212,7 @@
 		if (curopt + 1 <= memnum)
 			display_mem_info(menu, mem, start, end);
 
-		if (memnum == end)
+		if (memnum >= end)
 			break;
 	}