]> git.saurik.com Git - apt.git/commitdiff
Division by result of sizeof(). memset() expects a size in bytes
authorDavid Kalnischkies <david@kalnischkies.de>
Wed, 5 Nov 2014 17:42:56 +0000 (18:42 +0100)
committerDavid Kalnischkies <david@kalnischkies.de>
Sat, 8 Nov 2014 13:26:00 +0000 (14:26 +0100)
"did you intend to multiply instead?" is what cppcheck helpful says and
it is absolutely right. Doesn't make a whole lot of a difference though
as we are talking about 'char' in this testcase, but just to be sure.

Reported-By: cppcheck
Git-Dch: Ignore

test/libapt/fileutl_test.cc

index 8d47c5098bdda0f91a19aa018d03225c493d60bc..57d5bbdc2852e6f1700d5c0b534820abadda039d 100644 (file)
@@ -53,11 +53,16 @@ static void TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission
    // ensure the memory is as predictably messed up
 #define APT_INIT_READBACK \
    char readback[20]; \
-   memset(readback, 'D', sizeof(readback)/sizeof(readback[0])); \
+   memset(readback, 'D', sizeof(readback)*sizeof(readback[0])); \
    readback[19] = '\0';
 #define EXPECT_N_STR(expect, actual) \
    EXPECT_EQ(0, strncmp(expect, actual, strlen(expect)));
-
+   {
+      APT_INIT_READBACK
+      char const * const expect = "DDDDDDDDDDDDDDDDDDD";
+      EXPECT_STREQ(expect,readback);
+      EXPECT_N_STR(expect, readback);
+   }
    {
       APT_INIT_READBACK
       char const * const expect = "This";