[Asterisk-cvs] asterisk/astman astman.c,1.11.2.1,1.11.2.2

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/astman
In directory mongoose.digium.com:/tmp/cvs-serv15656/astman

Modified Files:
      Tag: v1-0
	astman.c 
Log Message:
hopefully the last try at making this happy across
various versions of newt (bug #4388)


Index: astman.c
===================================================================
RCS file: /usr/cvsroot/asterisk/astman/Attic/astman.c,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- astman.c	26 May 2005 12:21:27 -0000	1.11.2.1
+++ astman.c	28 May 2005 01:40:13 -0000	1.11.2.2
@@ -28,6 +28,14 @@
 #define MAX_HEADERS 80
 #define MAX_LEN 256
 
+/*
+ * 2005.05.27 - different versions of newt define the type of the buffer
+ * for the 5th argument to newtEntry() as char ** or const char ** . To 
+ * let the code compile cleanly with -Werror, we cast it to void * through 
+ * _NEWT_CAST.
+ */
+#define _NEWT_CAST (void *)
+
 static struct ast_mansession {
 	struct sockaddr_in sin;
 	int fd;
@@ -430,13 +438,13 @@
 	newtComponent ok;
 	newtComponent cancel;
 	newtComponent inpfield;
-	char *input;
+	const char *input;
 	int res = -1;
 	struct newtExitStruct es;
 
 	newtCenteredWindow(60,7, msg);
 
-	inpfield = newtEntry(5, 2, "", 50, (const char **)&input, 0);
+	inpfield = newtEntry(5, 2, "", 50, _NEWT_CAST &input, 0);
 	ok = newtButton(22, 3, "OK");
 	cancel = newtButton(32, 3, "Cancel");
 	form = newtForm(NULL, NULL, 0);
@@ -553,8 +561,8 @@
 	newtComponent label;
 	newtComponent ulabel;
 	newtComponent plabel;
-	char *user;
-	char *pass;
+	const char *user;
+	const char *pass;
 	struct message *m;
 	struct newtExitStruct es;
 	char tmp[55];
@@ -603,8 +611,8 @@
 	ulabel = newtLabel(4,2,"Username:");
 	plabel = newtLabel(4,3,"Password:");
 	
-	username = newtEntry(14, 2, "", 20, (const char **)&user, 0);
-	password = newtEntry(14, 3, "", 20, (const char **)&pass, NEWT_FLAG_HIDDEN);
+	username = newtEntry(14, 2, "", 20, _NEWT_CAST &user, 0);
+	password = newtEntry(14, 3, "", 20, _NEWT_CAST &pass, NEWT_FLAG_HIDDEN);
 	
 	form = newtForm(NULL, NULL, 0);
 	newtFormAddComponents(form, username, password, login, cancel, label, ulabel, plabel,NULL);