X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fseq_del.c;h=44ae6ce92d67542107c4ae7855ed6b09e9ba4f09;hp=eb41ec40705c3bc183095c6b9f5c76e8511fd7a1;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c diff --git a/sbr/seq_del.c b/sbr/seq_del.c index eb41ec4..44ae6ce 100644 --- a/sbr/seq_del.c +++ b/sbr/seq_del.c @@ -1,4 +1,3 @@ - /* * seq_del.c -- delete message(s) from a sequence * @@ -25,83 +24,83 @@ int seq_delsel (struct msgs *mp, char *cp, int public, int zero) { - int i, msgnum, new_seq = 1; + int i, msgnum, new_seq = 1; - if (!seq_nameok (cp)) - return 0; + if (!seq_nameok (cp)) + return 0; - /* - * Get the number for this sequence - */ - for (i = 0; mp->msgattrs[i]; i++) { - if (!strcmp (mp->msgattrs[i], cp)) { - new_seq = 0; - break; + /* + * Get the number for this sequence + */ + for (i = 0; mp->msgattrs[i]; i++) { + if (!strcmp (mp->msgattrs[i], cp)) { + new_seq = 0; + break; + } } - } - /* - * If the zero flag is set, first add all existing - * messages in this folder to the sequence. - */ - if (zero) { /* - * create the sequence, if necessary + * If the zero flag is set, first add all existing + * messages in this folder to the sequence. */ - if (new_seq) { - if (i >= NUMATTRS) { - advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp); - return 0; - } - if (!(mp->msgattrs[i] = strdup (cp))) { - advise (NULL, "strdup failed"); - return 0; - } - mp->msgattrs[i + 1] = NULL; + if (zero) { + /* + * create the sequence, if necessary + */ + if (new_seq) { + if (i >= NUMATTRS) { + advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp); + return 0; + } + if (!(mp->msgattrs[i] = strdup (cp))) { + advise (NULL, "strdup failed"); + return 0; + } + mp->msgattrs[i + 1] = NULL; + } + /* + * now add sequence bit to all existing messages + */ + for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++) { + if (does_exist (mp, msgnum)) + add_sequence (mp, i, msgnum); + else + clear_sequence (mp, i, msgnum); + } + } else { + if (new_seq) { + advise (NULL, "no such sequence as %s", cp); + return 0; + } } + /* - * now add sequence bit to all existing messages + * Now clear the bit on all selected messages */ - for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++) { - if (does_exist (mp, msgnum)) - add_sequence (mp, i, msgnum); - else - clear_sequence (mp, i, msgnum); - } - } else { - if (new_seq) { - advise (NULL, "no such sequence as %s", cp); - return 0; - } - } - - /* - * Now clear the bit on all selected messages - */ - for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) - if (is_selected (mp, msgnum)) - clear_sequence (mp, i, msgnum); - - /* - * Set the public/private bit for this sequence. - */ - if (public == 1) - make_seq_public (mp, i); - else if (public == 0) - make_seq_private (mp, i); - else if (new_seq) { + for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) + if (is_selected (mp, msgnum)) + clear_sequence (mp, i, msgnum); + /* - * If public == -1, then only set the - * public/private bit for new sequences. + * Set the public/private bit for this sequence. */ - if (is_readonly (mp)) - make_seq_private (mp, i); - else - make_seq_public (mp, i); - } - - mp->msgflags |= SEQMOD; - return 1; + if (public == 1) + make_seq_public (mp, i); + else if (public == 0) + make_seq_private (mp, i); + else if (new_seq) { + /* + * If public == -1, then only set the + * public/private bit for new sequences. + */ + if (is_readonly (mp)) + make_seq_private (mp, i); + else + make_seq_public (mp, i); + } + + mp->msgflags |= SEQMOD; + return 1; } @@ -114,19 +113,19 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero) int seq_delmsg (struct msgs *mp, char *cp, int msgnum) { - int i; + int i; - if (!seq_nameok (cp)) - return 0; + if (!seq_nameok (cp)) + return 0; - for (i = 0; mp->msgattrs[i]; i++) { - if (!strcmp (mp->msgattrs[i], cp)) { - clear_sequence (mp, i, msgnum); - mp->msgflags |= SEQMOD; - return 1; + for (i = 0; mp->msgattrs[i]; i++) { + if (!strcmp (mp->msgattrs[i], cp)) { + clear_sequence (mp, i, msgnum); + mp->msgflags |= SEQMOD; + return 1; + } } - } - advise (NULL, "no such sequence as %s", cp); - return 0; + advise (NULL, "no such sequence as %s", cp); + return 0; }