- if (now - received_time > keep_malformed)
- {
- snprintf(CS spoolname, sizeof(spoolname), "%s/msglog/%s/%s/%s",
- spool_directory, queue_name, message_subdir, id);
- Uunlink(spoolname);
- snprintf(CS spoolname, sizeof(spoolname), "%s/input/%s/%s/%s-D",
- spool_directory, queue_name, message_subdir, id);
- Uunlink(spoolname);
- snprintf(CS spoolname, sizeof(spoolname), "%s/input/%s/%s/%s-H",
- spool_directory, queue_name, message_subdir, id);
- Uunlink(spoolname);
- snprintf(CS spoolname, sizeof(spoolname), "%s/input/%s/%s/%s-J",
- spool_directory, queue_name, message_subdir, id);
- Uunlink(spoolname);
- log_write(0, LOG_MAIN, "Message removed because older than %s",
- readconf_printtime(keep_malformed));
- }
+ if (now - received_time > keep_malformed)
+ {
+ Uunlink(spool_fname(US"msglog", message_subdir, id, US""));
+ Uunlink(spool_fname(US"input", message_subdir, id, US"-D"));
+ Uunlink(spool_fname(US"input", message_subdir, id, US"-H"));
+ Uunlink(spool_fname(US"input", message_subdir, id, US"-J"));
+ log_write(0, LOG_MAIN, "Message removed because older than %s",
+ readconf_printtime(keep_malformed));
+ }