diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2015-07-26 14:15:58 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2015-07-26 14:15:58 -0600 |
| commit | 36b77661542a63c4579943951d143c8cc9c99460 (patch) | |
| tree | 07858a2130d5d46ac7eef9587e09be8080e43a3d /alpine | |
| parent | 7c946bfafe961c1dda51d19b5c29a5600ef1e5ec (diff) | |
| download | alpine-36b77661542a63c4579943951d143c8cc9c99460.tar.xz | |
* several changes to reduce warnings, including adding sys/ioctl.h
in system.h.
Diffstat (limited to 'alpine')
| -rw-r--r-- | alpine/adrbkcmd.c | 6 | ||||
| -rw-r--r-- | alpine/arg.c | 3 | ||||
| -rw-r--r-- | alpine/flagmaint.c | 2 | ||||
| -rw-r--r-- | alpine/mailcmd.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/alpine/adrbkcmd.c b/alpine/adrbkcmd.c index 8b80800b..8c0c0d62 100644 --- a/alpine/adrbkcmd.c +++ b/alpine/adrbkcmd.c @@ -7290,7 +7290,7 @@ prep_ldap_for_viewing(struct pine *ps, LDAP_CHOOSE_S *winning_e, SourceType srct */ snprintf(obuf, sizeof(obuf), "%c%c%c%s%s%c%c%c%c", TAG_EMBED, TAG_HANDLE, - strlen(buf), buf, vals[i], + strlen(buf), buf, vals[i]->bv_val, TAG_EMBED, TAG_BOLDOFF, TAG_EMBED, TAG_INVOFF); obuf[sizeof(obuf)-1] = '\0'; @@ -7300,7 +7300,7 @@ prep_ldap_for_viewing(struct pine *ps, LDAP_CHOOSE_S *winning_e, SourceType srct so_puts(store, "\n"); } else{ - snprintf(obuf, sizeof(obuf), "%s", vals[i]); + snprintf(obuf, sizeof(obuf), "%s", vals[i]->bv_val); obuf[sizeof(obuf)-1] = '\0'; if((tmp = fold(obuf, width, width, @@ -7313,7 +7313,7 @@ prep_ldap_for_viewing(struct pine *ps, LDAP_CHOOSE_S *winning_e, SourceType srct } } else{ - snprintf(obuf, sizeof(obuf), "%s", vals[i]); + snprintf(obuf, sizeof(obuf), "%s", vals[i]->bv_val); obuf[sizeof(obuf)-1] = '\0'; if((tmp = fold(obuf, width, width, diff --git a/alpine/arg.c b/alpine/arg.c index 836adf36..793dc711 100644 --- a/alpine/arg.c +++ b/alpine/arg.c @@ -1322,7 +1322,8 @@ pinerc_cmdline_opt(char *arg) /*--value is non-empty--*/ if(*value == '"' && !v->is_list){ value++; - for(p1 = value; *p1 && *p1 != '"'; p1++); + for(p1 = value; *p1 && *p1 != '"'; p1++) + ; if(*p1 == '"') *p1 = '\0'; else diff --git a/alpine/flagmaint.c b/alpine/flagmaint.c index acdccb1d..6112979a 100644 --- a/alpine/flagmaint.c +++ b/alpine/flagmaint.c @@ -265,7 +265,7 @@ try_again: (*alval)[offset+1] = NULL; } else{ - for(offset=0; (*alval)[offset]; offset++); + for(offset=0; (*alval)[offset]; offset++) ; fs_resize((void **) alval, (offset + 2) * sizeof(char *)); diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c index 9a37e7b4..eb506398 100644 --- a/alpine/mailcmd.c +++ b/alpine/mailcmd.c @@ -5622,7 +5622,7 @@ broach_folder(int qline, int allow_list, int *notrealinbox, CONTEXT_S **context) if(f2) fs_give((void **)&f2); flags = OE_APPEND_CURRENT; - rc = optionally_enter(f1, qline, 0, sizeof(newfolder), + rc = optionally_enter((char *) f1, qline, 0, sizeof(newfolder), (char *) prompt, ekey, help, &flags); f2 = folder_name_encoded(f1); |