From: Victor Julien Date: Thu, 18 Jan 2018 16:38:09 +0000 (+0100) Subject: filestore: minor cleanups and warning fixes X-Git-Tag: suricata-4.1.0-beta1~331 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d05355db3d6e2752ae0582a7ea8c1a0f08bde91c;p=thirdparty%2Fsuricata.git filestore: minor cleanups and warning fixes --- diff --git a/src/output-filestore.c b/src/output-filestore.c index d5eb2c9688..fe83f1b06a 100644 --- a/src/output-filestore.c +++ b/src/output-filestore.c @@ -15,8 +15,6 @@ * 02110-1301, USA. */ -#include - #include "suricata-common.h" #include "app-layer-parser.h" @@ -162,10 +160,9 @@ static void OutputFilestoreFinalizeFiles(ThreadVars *tv, if (ctx->fileinfo) { char js_metadata_filename[PATH_MAX]; snprintf(js_metadata_filename, sizeof(js_metadata_filename), - "%s.%"PRIuMAX".%d.json", final_filename, p->ts.tv_sec, - ff->file_store_id); + "%s.%"PRIuMAX".%u.json", final_filename, + (uintmax_t)p->ts.tv_sec, ff->file_store_id); json_t *js_fileinfo = JsonBuildFileInfoRecord(p, ff, true); - if (likely(js_fileinfo != NULL)) { json_dump_file(js_fileinfo, js_metadata_filename, 0); json_decref(js_fileinfo);