On Fri, Apr 23, 2021 at 6:54 AM Ian Rogers <irogers@xxxxxxxxxx> wrote: > > Fix warnings of the form: > > utest/tracefs-utest.c:476:35: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int] > CU_TEST(strstr(kprobes, KPROBE_1 + 2) != NULL); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~ > Hi Ian, Thanks for testing and sending this patch. What compiler/version/options you are using to get these warnings ? The whole patchset looks good to me. Acked-by: Tzvetomir Stoyanov <tz.stoyanov@xxxxxxxxx> > Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx> > --- > utest/tracefs-utest.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c > index edb3a3d..c5efd5f 100644 > --- a/utest/tracefs-utest.c > +++ b/utest/tracefs-utest.c > @@ -453,21 +453,21 @@ static void test_instance_file(void) > CU_TEST(ret == strlen(KPROBE_1)); > kprobes = tracefs_instance_file_read(NULL, KPROB_EVTS, &size); > CU_TEST(kprobes != NULL); > - CU_TEST(strstr(kprobes, KPROBE_1 + 2) != NULL); > + CU_TEST(strstr(kprobes, &KPROBE_1[2]) != NULL); > free(kprobes); > > ret = tracefs_instance_file_append(NULL, KPROB_EVTS, KPROBE_2); > CU_TEST(ret == strlen(KPROBE_2)); > kprobes = tracefs_instance_file_read(NULL, KPROB_EVTS, &size); > CU_TEST(kprobes != NULL); > - CU_TEST(strstr(kprobes, KPROBE_2 + 2) != NULL); > + CU_TEST(strstr(kprobes, &KPROBE_2[2]) != NULL); > free(kprobes); > > ret = tracefs_instance_file_append(NULL, KPROB_EVTS, KPROBE_1_RM); > CU_TEST(ret == strlen(KPROBE_1_RM)); > kprobes = tracefs_instance_file_read(NULL, KPROB_EVTS, &size); > CU_TEST(kprobes != NULL); > - CU_TEST(strstr(kprobes, KPROBE_1 + 2) == NULL); > + CU_TEST(strstr(kprobes, &KPROBE_1[2]) == NULL); > free(kprobes); > > ret = tracefs_instance_file_clear(NULL, KPROB_EVTS); > -- > 2.31.1.498.g6c1eba8ee3d-goog > -- Tzvetomir (Ceco) Stoyanov VMware Open Source Technology Center
|