From 9477fd46287f8285f555e8b15a4542d6d4a3dfe9 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 28 Nov 2016 10:09:16 +0100 Subject: [PATCH] eve-file: fix -Wshadow warnings --- src/output-json-file.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/output-json-file.c b/src/output-json-file.c index 29b3d0e5d1..b47340aa65 100644 --- a/src/output-json-file.c +++ b/src/output-json-file.c @@ -128,29 +128,29 @@ static void FileWriteJsonRecord(JsonFileLogThread *aft, const Packet *p, const F if (ff->flags & FILE_MD5) { size_t x; int i; - char s[256]; + char str[256]; for (i = 0, x = 0; x < sizeof(ff->md5); x++) { - i += snprintf(&s[i], 255-i, "%02x", ff->md5[x]); + i += snprintf(&str[i], 255-i, "%02x", ff->md5[x]); } - json_object_set_new(fjs, "md5", json_string(s)); + json_object_set_new(fjs, "md5", json_string(str)); } if (ff->flags & FILE_SHA1) { size_t x; int i; - char s[256]; + char str[256]; for (i = 0, x = 0; x < sizeof(ff->sha1); x++) { - i += snprintf(&s[i], 255-i, "%02x", ff->sha1[x]); + i += snprintf(&str[i], 255-i, "%02x", ff->sha1[x]); } - json_object_set_new(fjs, "sha1", json_string(s)); + json_object_set_new(fjs, "sha1", json_string(str)); } if (ff->flags & FILE_SHA256) { size_t x; int i; - char s[256]; + char str[256]; for (i = 0, x = 0; x < sizeof(ff->sha256); x++) { - i += snprintf(&s[i], 255-i, "%02x", ff->sha256[x]); + i += snprintf(&str[i], 255-i, "%02x", ff->sha256[x]); } - json_object_set_new(fjs, "sha256", json_string(s)); + json_object_set_new(fjs, "sha256", json_string(str)); } #endif break;