X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fseq_del.c;h=5555f1155fdbee3051f344998c4494a29564cd1a;hp=1dbb0b828523c76178e8790a7b4226763cbddd8e;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/sbr/seq_del.c b/sbr/seq_del.c index 1dbb0b8..5555f11 100644 --- a/sbr/seq_del.c +++ b/sbr/seq_del.c @@ -22,18 +22,19 @@ */ int -seq_delsel (struct msgs *mp, char *cp, int public, int zero) +seq_delsel(struct msgs *mp, char *cp, int public, int zero) { - int i, msgnum, new_seq = 1; + unsigned int i; + int msgnum, new_seq = 1; - if (!seq_nameok (cp)) + 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)) { + if (strcmp(mp->msgattrs[i], cp)==0) { new_seq = 0; break; } @@ -49,11 +50,11 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero) */ if (new_seq) { if (i >= NUMATTRS) { - advise (NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp); + advise(NULL, "only %d sequences allowed (no room for %s)!", NUMATTRS, cp); return 0; } - if (!(mp->msgattrs[i] = strdup (cp))) { - advise (NULL, "strdup failed"); + if (!(mp->msgattrs[i] = strdup(cp))) { + advise(NULL, "strdup failed"); return 0; } mp->msgattrs[i + 1] = NULL; @@ -62,14 +63,14 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero) ** 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); + if (does_exist(mp, msgnum)) + add_sequence(mp, i, msgnum); else - clear_sequence (mp, i, msgnum); + clear_sequence(mp, i, msgnum); } } else { if (new_seq) { - advise (NULL, "no such sequence as %s", cp); + advise(NULL, "no such sequence as %s", cp); return 0; } } @@ -78,25 +79,25 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero) ** 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); + 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); + make_seq_public(mp, i); else if (public == 0) - make_seq_private (mp, i); + 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); + if (is_readonly(mp)) + make_seq_private(mp, i); else - make_seq_public (mp, i); + make_seq_public(mp, i); } mp->msgflags |= SEQMOD; @@ -111,21 +112,21 @@ seq_delsel (struct msgs *mp, char *cp, int public, int zero) */ int -seq_delmsg (struct msgs *mp, char *cp, int msgnum) +seq_delmsg(struct msgs *mp, char *cp, int msgnum) { int i; - if (!seq_nameok (cp)) + if (!seq_nameok(cp)) return 0; for (i = 0; mp->msgattrs[i]; i++) { - if (!strcmp (mp->msgattrs[i], cp)) { - clear_sequence (mp, i, msgnum); + if (strcmp(mp->msgattrs[i], cp)==0) { + clear_sequence(mp, i, msgnum); mp->msgflags |= SEQMOD; return 1; } } - advise (NULL, "no such sequence as %s", cp); + advise(NULL, "no such sequence as %s", cp); return 0; }