X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=4a8da144a74f3ade58da932afa259672d0f49971;hb=fb0594cb913cab5e14e2c295b79eb48cc675bbbf;hp=2c16dfef9324f1566838dcf164c86fd600433b7f;hpb=39cd310f18074231e3400e53f7e5234a8615a87e;p=mmh diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index 2c16dfe..4a8da14 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -31,10 +31,6 @@ extern char *formataddr(); /* hook for custom address formatting */ -#ifdef LBL -struct msgs *fmt_current_folder; /* current folder (set by main program) */ -#endif - extern int fmt_norm; /* defined in sbr/fmt_def.c = AD_NAME */ struct mailname fmt_mnull; @@ -878,28 +874,17 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat) } break; - case FT_ADDTOSEQ: -#ifdef LBL - /* - ** If we're working on a folder (as opposed to a - ** file), add the current msg to sequence given - ** in literal field. Don't disturb string or - ** value registers. - */ - if (fmt_current_folder) - seq_addmsg(fmt_current_folder, fmt->f_text, dat[0], -1); -#endif - break; } fmt++; } -#ifndef JLR - finished:; +finished:; if (cp[-1] != '\n') *cp++ = '\n'; - *cp = 0; + *cp = '\0'; return ((struct format *)0); -#else /* JLR */ + +#ifdef JLR + /* I'll remove this as soon as I understand what it does. --meillo */ if (cp[-1] != '\n') *cp++ = '\n'; while (fmt->f_type != FT_DONE) @@ -908,6 +893,6 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat) finished:; *cp = '\0'; return (fmt->f_value ? ++fmt : (struct format *) 0); - #endif /* JLR */ + }