mirror of
https://github.com/mirror/wget.git
synced 2026-08-19 09:23:27 +08:00
* src/warc.c (warc_start_new_file): Simplify code
This commit is contained in:
26
src/warc.c
26
src/warc.c
@@ -862,9 +862,6 @@ warc_start_new_file (bool meta)
|
||||
const char *extension = "warc";
|
||||
#endif
|
||||
|
||||
int base_filename_length;
|
||||
char *new_filename;
|
||||
|
||||
if (opt.warc_filename == NULL)
|
||||
return false;
|
||||
|
||||
@@ -876,35 +873,26 @@ warc_start_new_file (bool meta)
|
||||
|
||||
warc_current_file_number++;
|
||||
|
||||
base_filename_length = strlen (opt.warc_filename);
|
||||
/* filename format: base + "-" + 5 digit serial number + ".warc.gz" */
|
||||
new_filename = xmalloc (base_filename_length + 1 + 5 + 8 + 1);
|
||||
|
||||
warc_current_filename = new_filename;
|
||||
|
||||
/* If max size is enabled, we add a serial number to the file names. */
|
||||
if (meta)
|
||||
sprintf (new_filename, "%s-meta.%s", opt.warc_filename, extension);
|
||||
warc_current_filename = aprintf ("%s-meta.%s", opt.warc_filename, extension);
|
||||
else if (opt.warc_maxsize > 0)
|
||||
{
|
||||
sprintf (new_filename, "%s-%05d.%s", opt.warc_filename,
|
||||
warc_current_file_number, extension);
|
||||
}
|
||||
warc_current_filename = aprintf ("%s-%05d.%s", opt.warc_filename, warc_current_file_number, extension);
|
||||
else
|
||||
sprintf (new_filename, "%s.%s", opt.warc_filename, extension);
|
||||
warc_current_filename = aprintf ("%s.%s", opt.warc_filename, extension);
|
||||
|
||||
logprintf (LOG_VERBOSE, _("Opening WARC file %s.\n\n"), quote (new_filename));
|
||||
logprintf (LOG_VERBOSE, _("Opening WARC file %s.\n\n"), quote (warc_current_filename));
|
||||
|
||||
/* Open the WARC file. */
|
||||
warc_current_file = fopen (new_filename, "wb+");
|
||||
warc_current_file = fopen (warc_current_filename, "wb+");
|
||||
if (warc_current_file == NULL)
|
||||
{
|
||||
logprintf (LOG_NOTQUIET, _("Error opening WARC file %s.\n"),
|
||||
quote (new_filename));
|
||||
quote (warc_current_filename));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! warc_write_warcinfo_record (new_filename))
|
||||
if (! warc_write_warcinfo_record (warc_current_filename))
|
||||
return false;
|
||||
|
||||
/* Add warcinfo uuid to manifest. */
|
||||
|
||||
Reference in New Issue
Block a user