| Message ID | 1465345628-32160-1-git-send-email-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On 08/06/16 01:27, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/lib/src/fwts_arch.c | 2 +- > src/lib/src/fwts_args.c | 2 +- > src/lib/src/fwts_framework.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/lib/src/fwts_arch.c b/src/lib/src/fwts_arch.c > index 6456604..cd2a7d9 100644 > --- a/src/lib/src/fwts_arch.c > +++ b/src/lib/src/fwts_arch.c > @@ -80,7 +80,7 @@ const char *fwts_arch_names(void) > for (ptr = arch_info, len = 1; ptr->arch != FWTS_ARCH_OTHER; ptr++) > len += strlen(ptr->name) + 1; > > - arch_names = calloc(len, 1); > + arch_names = calloc(len, sizeof(char)); > if (arch_names) { > for (ptr = arch_info; ptr->arch != FWTS_ARCH_OTHER; ptr++) { > strcat(arch_names, ptr->name); > diff --git a/src/lib/src/fwts_args.c b/src/lib/src/fwts_args.c > index 57bff59..83287a2 100644 > --- a/src/lib/src/fwts_args.c > +++ b/src/lib/src/fwts_args.c > @@ -363,7 +363,7 @@ char *fwts_args_comma_list(const char *arg) > > /* Any empty list should return an empty string and not NULL */ > if (retstr == NULL) > - retstr = calloc(1, 1); > + retstr = calloc(1, sizeof(char)); > /* Return NULL on calloc failure must be handled by caller */ > > return retstr; > diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c > index 2faeb67..c53306a 100644 > --- a/src/lib/src/fwts_framework.c > +++ b/src/lib/src/fwts_framework.c > @@ -936,7 +936,7 @@ static void fwts_framework_heading_info( > for (len = 1, i = 1; i < argc; i++) > len += strlen(argv[i]) + 1; > > - if ((args = calloc(len, 1)) != NULL) { > + if ((args = calloc(len, sizeof(char))) != NULL) { > for (i = 1; i < argc; i++) { > strcat(args, " "); > strcat(args, argv[i]); > @@ -951,7 +951,7 @@ static void fwts_framework_heading_info( > len += strlen(test->name) + 1; > } > > - if ((tests = calloc(len, 1)) != NULL) { > + if ((tests = calloc(len, sizeof(char))) != NULL) { > fwts_list_foreach(item, tests_to_run) { > fwts_framework_test *test = fwts_list_data(fwts_framework_test *, item); > if (item != fwts_list_head(tests_to_run)) > Acked-by: Colin Ian King <colin.king@canonical.com>
On 2016年06月08日 08:27, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/lib/src/fwts_arch.c | 2 +- > src/lib/src/fwts_args.c | 2 +- > src/lib/src/fwts_framework.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/lib/src/fwts_arch.c b/src/lib/src/fwts_arch.c > index 6456604..cd2a7d9 100644 > --- a/src/lib/src/fwts_arch.c > +++ b/src/lib/src/fwts_arch.c > @@ -80,7 +80,7 @@ const char *fwts_arch_names(void) > for (ptr = arch_info, len = 1; ptr->arch != FWTS_ARCH_OTHER; ptr++) > len += strlen(ptr->name) + 1; > > - arch_names = calloc(len, 1); > + arch_names = calloc(len, sizeof(char)); > if (arch_names) { > for (ptr = arch_info; ptr->arch != FWTS_ARCH_OTHER; ptr++) { > strcat(arch_names, ptr->name); > diff --git a/src/lib/src/fwts_args.c b/src/lib/src/fwts_args.c > index 57bff59..83287a2 100644 > --- a/src/lib/src/fwts_args.c > +++ b/src/lib/src/fwts_args.c > @@ -363,7 +363,7 @@ char *fwts_args_comma_list(const char *arg) > > /* Any empty list should return an empty string and not NULL */ > if (retstr == NULL) > - retstr = calloc(1, 1); > + retstr = calloc(1, sizeof(char)); > /* Return NULL on calloc failure must be handled by caller */ > > return retstr; > diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c > index 2faeb67..c53306a 100644 > --- a/src/lib/src/fwts_framework.c > +++ b/src/lib/src/fwts_framework.c > @@ -936,7 +936,7 @@ static void fwts_framework_heading_info( > for (len = 1, i = 1; i < argc; i++) > len += strlen(argv[i]) + 1; > > - if ((args = calloc(len, 1)) != NULL) { > + if ((args = calloc(len, sizeof(char))) != NULL) { > for (i = 1; i < argc; i++) { > strcat(args, " "); > strcat(args, argv[i]); > @@ -951,7 +951,7 @@ static void fwts_framework_heading_info( > len += strlen(test->name) + 1; > } > > - if ((tests = calloc(len, 1)) != NULL) { > + if ((tests = calloc(len, sizeof(char))) != NULL) { > fwts_list_foreach(item, tests_to_run) { > fwts_framework_test *test = fwts_list_data(fwts_framework_test *, item); > if (item != fwts_list_head(tests_to_run)) > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/lib/src/fwts_arch.c b/src/lib/src/fwts_arch.c index 6456604..cd2a7d9 100644 --- a/src/lib/src/fwts_arch.c +++ b/src/lib/src/fwts_arch.c @@ -80,7 +80,7 @@ const char *fwts_arch_names(void) for (ptr = arch_info, len = 1; ptr->arch != FWTS_ARCH_OTHER; ptr++) len += strlen(ptr->name) + 1; - arch_names = calloc(len, 1); + arch_names = calloc(len, sizeof(char)); if (arch_names) { for (ptr = arch_info; ptr->arch != FWTS_ARCH_OTHER; ptr++) { strcat(arch_names, ptr->name); diff --git a/src/lib/src/fwts_args.c b/src/lib/src/fwts_args.c index 57bff59..83287a2 100644 --- a/src/lib/src/fwts_args.c +++ b/src/lib/src/fwts_args.c @@ -363,7 +363,7 @@ char *fwts_args_comma_list(const char *arg) /* Any empty list should return an empty string and not NULL */ if (retstr == NULL) - retstr = calloc(1, 1); + retstr = calloc(1, sizeof(char)); /* Return NULL on calloc failure must be handled by caller */ return retstr; diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c index 2faeb67..c53306a 100644 --- a/src/lib/src/fwts_framework.c +++ b/src/lib/src/fwts_framework.c @@ -936,7 +936,7 @@ static void fwts_framework_heading_info( for (len = 1, i = 1; i < argc; i++) len += strlen(argv[i]) + 1; - if ((args = calloc(len, 1)) != NULL) { + if ((args = calloc(len, sizeof(char))) != NULL) { for (i = 1; i < argc; i++) { strcat(args, " "); strcat(args, argv[i]); @@ -951,7 +951,7 @@ static void fwts_framework_heading_info( len += strlen(test->name) + 1; } - if ((tests = calloc(len, 1)) != NULL) { + if ((tests = calloc(len, sizeof(char))) != NULL) { fwts_list_foreach(item, tests_to_run) { fwts_framework_test *test = fwts_list_data(fwts_framework_test *, item); if (item != fwts_list_head(tests_to_run))
Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/lib/src/fwts_arch.c | 2 +- src/lib/src/fwts_args.c | 2 +- src/lib/src/fwts_framework.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)