[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     b14f6eceb178d3a95eeba27fe7c26a0081e8b4d3
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Thu Jan 24 10:08:23 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Thu Jan 24 10:08:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=b14f6ece

Add missing comments and initializations to the help lines.

---
 ufed-curses-help.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ufed-curses-help.c b/ufed-curses-help.c
index 3803144..62835f9 100644
--- a/ufed-curses-help.c
+++ b/ufed-curses-help.c
@@ -11,13 +11,23 @@
 #include <strings.h>
 #include <unistd.h>
 
+/* internal types */
 static struct line {
 	struct item item;
 	char *text;
 } *lines;
+
+/* internal members */
 static int helpheight, helpwidth;
 
+/* external members */
+extern enum mask showMasked;
+extern enum scope showScope;
+
+/* internal prototypes */
 static void free_lines(void);
+
+/* function implementations */
 static void init_lines(void) {
 	static const char * const help[] = {
 "ufed is a simple program designed to help you configure the systems USE "
@@ -110,7 +120,7 @@ static void init_lines(void) {
 	for(;;) {
 		line = malloc(sizeof *line);
 		if(line==NULL)
-			exit(-1);
+			ERROR_EXIT(-1, "Can not allocate %lu bytes for help line struct\n", sizeof(*line));
 		if(lines==NULL) {
 			line->item.prev = (struct item *) line;
 			line->item.next = (struct item *) line;
@@ -121,6 +131,10 @@ static void init_lines(void) {
 			lines->item.prev->next = (struct item *) line;
 			lines->item.prev = (struct item *) line;
 		}
+
+		line->item.currline = 0;
+		line->item.isMasked = false;
+		line->item.isGlobal = true;
 		line->item.listline = y++;
 		line->item.ndescr = 1;
 		n = strlen(word);
@@ -132,11 +146,10 @@ static void init_lines(void) {
 				}
 			}
 		}
-		line->text = malloc(n+1);
+		line->text = calloc((n+1), sizeof(char));
 		if(line->text==NULL)
-			exit(-1);
+			ERROR_EXIT(-1, "Can not allocate %lu bytes for help line\n", (n+1) * sizeof(char));
 		memcpy(line->text, word, n);
-		line->text[n] = '\0';
 		while(word[n]==' ')
 			n++;
 		word += n;