diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-04-08 08:53:12 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-04-08 08:53:12 -0600 |
| commit | 7ca059d80aae996ff3031aca15241a55e255a0f5 (patch) | |
| tree | 5b7ca64156469d2ba4f89d1de00871d75ca4626f /alpine/reply.c | |
| parent | 4f13a7bcddc60430203fd545a3c584b3e9fc27aa (diff) | |
| download | alpine-7ca059d80aae996ff3031aca15241a55e255a0f5.tar.xz | |
* Clear out some warnings given by gcc 10.
Diffstat (limited to 'alpine/reply.c')
| -rw-r--r-- | alpine/reply.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/alpine/reply.c b/alpine/reply.c index 7ec610a6..184f9f4a 100644 --- a/alpine/reply.c +++ b/alpine/reply.c @@ -106,7 +106,6 @@ reply(struct pine *pine_state, ACTION_S *role_arg) REPLY_S reply; void *msgtext = NULL; char *tmpfix = NULL, *prefix = NULL, *fcc = NULL, *errmsg = NULL; - char *hostpart; long msgno, j, totalm, rflags, *seq = NULL; int i, include_text = 0, times = -1, warned = 0, rv = 0, flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0; @@ -1015,9 +1014,8 @@ reply_text_query(struct pine *ps, long int many, ENVELOPE *env, char **prefix) int ret, edited = 0, headers = 0; static ESCKEY_S compose_style[MAX_REPLY_OPTIONS]; int ekey_num; - int orig_sf; - orig_sf = ps->reply.use_flowed = *prefix && **prefix ? (F_OFF(F_QUELL_FLOWED_TEXT, ps) + ps->reply.use_flowed = *prefix && **prefix ? (F_OFF(F_QUELL_FLOWED_TEXT, ps) && F_OFF(F_STRIP_WS_BEFORE_SEND, ps) && (strcmp(*prefix, "> ") == 0 || strcmp(*prefix, ">") == 0)) : 0; @@ -1068,8 +1066,6 @@ reply_text_query(struct pine *ps, long int many, ENVELOPE *env, char **prefix) compose_style[ekey_num++].label = N_("Edit Indent String"); } } else { /***** Alternate Reply Menu ********/ - unsigned which_help; - snprintf(tmp_20k_buf, SIZEOF_20KBUF, _("Include %s%soriginal message%s in Reply (using \"%s%s%s\")? "), (many > 1L) ? comatose(many) : "", (many > 1L) ? " " : "", @@ -1198,7 +1194,7 @@ reply_text_query(struct pine *ps, long int many, ENVELOPE *env, char **prefix) if(flags & OE_USER_MODIFIED){ fs_give((void **)prefix); *prefix = removing_quotes(cpystr(buf)); - orig_sf = ps->reply.use_flowed = *prefix && **prefix ? + ps->reply.use_flowed = *prefix && **prefix ? (F_OFF(F_QUELL_FLOWED_TEXT, ps) && F_OFF(F_STRIP_WS_BEFORE_SEND, ps) && (strcmp(*prefix, "> ") == 0 |