sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hopefully the last commit to make things happy 

across various versions of newt (bug #4388)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant 2005-05-28 01:37:47 +00:00
parent a67bb4c8fc
commit 8791d21995
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/astman.c
View File

@ -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 @@ static int get_user_input(char *msg, char *buf, int buflen)
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 @@ static int login(char *hostname)
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 @@ static int login(char *hostname)
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);