From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 8 Jan 2015 16:22:12 +0000 (+0100)
Subject: common/escape.c: move cppcheck-suppress to correct lines
X-Git-Tag: suse_latest~36^2~9^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=863dde2da3371c9f1b59597d97e694149adfbed2;p=ceph.git

common/escape.c: move cppcheck-suppress to correct lines

Seems that it doesn't work to add the cppcheck-suppress to
the define. Needs to go to the memcpy call using the define.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/common/escape.c b/src/common/escape.c
index cf3864e15e4..7eb851a169f 100644
--- a/src/common/escape.c
+++ b/src/common/escape.c
@@ -22,7 +22,6 @@
  */
 
 /* Static string length */
-// cppcheck-suppress sizeofDivisionMemfunc
 #define SSTRL(x) ((sizeof(x)/sizeof(x[0])) - 1)
 
 #define LESS_THAN_XESCAPE		"&lt;"
@@ -77,22 +76,27 @@ 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 +170,27 @@ void escape_json_attr(const char *buf, int src_len, char *out)
 		unsigned char c = *b;
 		switch (c) {
 		case '"':
+			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, DBL_QUOTE_JESCAPE, SSTRL(DBL_QUOTE_JESCAPE));
 			o += SSTRL(DBL_QUOTE_JESCAPE);
 			break;
 		case '\\':
+			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, BACKSLASH_JESCAPE, SSTRL(BACKSLASH_JESCAPE));
 			o += SSTRL(BACKSLASH_JESCAPE);
 			break;
 		case '/':
+			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, SLASH_JESCAPE, SSTRL(SLASH_JESCAPE));
 			o += SSTRL(SLASH_JESCAPE);
 			break;
 		case '\t':
+			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, TAB_JESCAPE, SSTRL(TAB_JESCAPE));
 			o += SSTRL(TAB_JESCAPE);
 			break;
 		case '\n':
+			// cppcheck-suppress sizeofDivisionMemfunc
 			memcpy(o, NEWLINE_JESCAPE, SSTRL(NEWLINE_JESCAPE));
 			o += SSTRL(NEWLINE_JESCAPE);
 			break;