Remove unused variable

diff --git a/citadel/textclient/commands.c b/citadel/textclient/commands.c
index 98be7a698ac17e9e9a281c34bd9183cd15c0490d..e6cbffc774add40160b9eccd602ace210eb69f98 100644 (file)
--- a/citadel/textclient/commands.c
+++ b/citadel/textclient/commands.c
@@ -575,8 +575,9 @@ void strprompt(char *prompt, char *str, int len)
        scr_printf(": ");
        color(BRIGHT_CYAN);
        ctdl_getline(buf, len);
-       if (buf[0] != 0)
+       if (buf[0] != 0) {
                strcpy(str, buf);
+       }
        color(DIM_WHITE);
 }
 
@@ -636,6 +637,7 @@ int intprompt(char *prompt, int ival, int imin, int imax)
  */
 void newprompt(char *prompt, char *str, int len)
 {
+       str[0] = 0;
        color(BRIGHT_MAGENTA);
        scr_printf("%s", prompt);
        color(DIM_MAGENTA);
@@ -1054,6 +1056,7 @@ int getcmd(CtdlIPC *ipc, char *argbuf)
                        if (cmdmatch(cmdbuf, cptr, 5)) {
                                /* We've found our command. */
                                if (requires_string(cptr, cmdpos)) {
+                                       argbuf[0] = 0;
                                        ctdl_getline(argbuf, 64);
                                } else {
                                        scr_printf("\n");

diff --git a/citadel/utils/chkpw.c b/citadel/utils/chkpw.c
index b0f0d5885b5b22b140ebc58116029a0c3cd3cb79..2270646381641285d32aa0341cd1bf751b531bbc 100644 (file)
--- a/citadel/utils/chkpw.c
+++ b/citadel/utils/chkpw.c
@@ -114,7 +114,6 @@ int main(int argc, char **argv) {
        struct passwd *p;
        int uid;
        char ctdldir[PATH_MAX]=CTDLDIR;
-       char *ptr = NULL;
        
        calc_dirs_n_files(0,0,"", ctdldir, 0);
        
@@ -127,7 +126,7 @@ int main(int argc, char **argv) {
        }
        while(1) {
                printf("\n\nUsername: ");
-               ptr = fgets(buf, sizeof buf, stdin);
+               fgets(buf, sizeof buf, stdin);
                buf[strlen(buf)-1] = 0;
                p = getpwnam(buf);
                if (p == NULL) {
@@ -137,7 +136,7 @@ int main(int argc, char **argv) {
                        uid = p->pw_uid;
                        printf("     uid: %d\n", uid);
                        printf("Password: ");
-                       ptr = fgets(buf, sizeof buf, stdin);
+                       fgets(buf, sizeof buf, stdin);
                        buf[strlen(buf)-1] = 0;
                        validpw(uid, buf);
                }