From: Brad Hubbard <bhubbard@redhat.com>
Date: Tue, 11 Apr 2017 01:33:03 +0000 (+1000)
Subject: common: Restructure cppcheck suppresions
X-Git-Tag: v12.0.2~99^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18107e2b492c5ac2b7b8ce7ff3f7b3849762dc26;p=ceph.git

common: Restructure cppcheck suppresions

Some of the suppressions are currently redundant and some need to be
changed.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/common/escape.c b/src/common/escape.c
index ce6309aa169..0d318e5f430 100644
--- a/src/common/escape.c
+++ b/src/common/escape.c
@@ -76,27 +76,22 @@ void escape_xml_attr(const char *buf, char *out)
 		unsigned char c = *b;
 		switch (c) {
 		case '<':
-			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, LESS_THAN_XESCAPE, SSTRL(LESS_THAN_XESCAPE));
 			o += SSTRL(LESS_THAN_XESCAPE);
 			break;
 		case '&':
-			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, AMPERSAND_XESCAPE, SSTRL(AMPERSAND_XESCAPE));
 			o += SSTRL(AMPERSAND_XESCAPE);
 			break;
 		case '>':
-			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, GREATER_THAN_XESCAPE, SSTRL(GREATER_THAN_XESCAPE));
 			o += SSTRL(GREATER_THAN_XESCAPE);
 			break;
 		case '\'':
-			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, SGL_QUOTE_XESCAPE, SSTRL(SGL_QUOTE_XESCAPE));
 			o += SSTRL(SGL_QUOTE_XESCAPE);
 			break;
 		case '"':
-			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, DBL_QUOTE_XESCAPE, SSTRL(DBL_QUOTE_XESCAPE));
 			o += SSTRL(DBL_QUOTE_XESCAPE);
 			break;
@@ -166,22 +161,22 @@ void escape_json_attr(const char *buf, int src_len, char *out)
 		unsigned char c = *b;
 		switch (c) {
 		case '"':
-			// cppcheck-suppress sizeofDivisionMemfunc
+			// cppcheck-suppress invalidFunctionArg
 			memcpy(o, DBL_QUOTE_JESCAPE, SSTRL(DBL_QUOTE_JESCAPE));
 			o += SSTRL(DBL_QUOTE_JESCAPE);
 			break;
 		case '\\':
-			// cppcheck-suppress sizeofDivisionMemfunc
+			// cppcheck-suppress invalidFunctionArg
 			memcpy(o, BACKSLASH_JESCAPE, SSTRL(BACKSLASH_JESCAPE));
 			o += SSTRL(BACKSLASH_JESCAPE);
 			break;
 		case '\t':
-			// cppcheck-suppress sizeofDivisionMemfunc
+			// cppcheck-suppress invalidFunctionArg
 			memcpy(o, TAB_JESCAPE, SSTRL(TAB_JESCAPE));
 			o += SSTRL(TAB_JESCAPE);
 			break;
 		case '\n':
-			// cppcheck-suppress sizeofDivisionMemfunc
+			// cppcheck-suppress invalidFunctionArg
 			memcpy(o, NEWLINE_JESCAPE, SSTRL(NEWLINE_JESCAPE));
 			o += SSTRL(NEWLINE_JESCAPE);
 			break;