perf tools: Convert open coded equivalents to asprintf()

The following snippet
	V = malloc(S);
	if (!V) { }
	sprintf(V, ...)

Can be easily changed to a one line:

	if (asprintf(&V, ...) < 0) { }

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Link: http://lkml.kernel.org/r/1404474229-15272-1-git-send-email-andriy.shevchenko@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index 7e6fcfe8b43853da45767687f4eb9d6e1453f6c1..c3bba883f5c3b347ebba815386e0916cdbda8cc2 100644 (file)
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -191,12 +191,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
                    strcmp(dent->d_name, "..") == 0 ||
                    !name_in_tp_list(dent->d_name, tps))
                        continue;
-               format = malloc(strlen(sys) + strlen(dent->d_name) + 10);
-               if (!format) {
+               if (asprintf(&format, "%s/%s/format", sys, dent->d_name) < 0) {
                        err = -ENOMEM;
                        goto out;
                }
-               sprintf(format, "%s/%s/format", sys, dent->d_name);
                ret = stat(format, &st);
                free(format);
                if (ret < 0)
@@ -217,12 +215,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
                    strcmp(dent->d_name, "..") == 0 ||
                    !name_in_tp_list(dent->d_name, tps))
                        continue;
-               format = malloc(strlen(sys) + strlen(dent->d_name) + 10);
-               if (!format) {
+               if (asprintf(&format, "%s/%s/format", sys, dent->d_name) < 0) {
                        err = -ENOMEM;
                        goto out;
                }
-               sprintf(format, "%s/%s/format", sys, dent->d_name);
                ret = stat(format, &st);
 
                if (ret >= 0) {
@@ -317,12 +313,10 @@ static int record_event_files(struct tracepoint_path *tps)
                    strcmp(dent->d_name, "ftrace") == 0 ||
                    !system_in_tp_list(dent->d_name, tps))
                        continue;
-               sys = malloc(strlen(path) + strlen(dent->d_name) + 2);
-               if (!sys) {
+               if (asprintf(&sys, "%s/%s", path, dent->d_name) < 0) {
                        err = -ENOMEM;
                        goto out;
                }
-               sprintf(sys, "%s/%s", path, dent->d_name);
                ret = stat(sys, &st);
                if (ret >= 0) {
                        ssize_t size = strlen(dent->d_name) + 1;

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 95aefa78bb075a52491b892f7ddccc259d909799..e4132aeeb780f0dd761d1c56a5c9864d9ff79d40 100644 (file)
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -333,12 +333,9 @@ const char *find_tracing_dir(void)
        if (!debugfs)
                return NULL;
 
-       tracing = malloc(strlen(debugfs) + 9);
-       if (!tracing)
+       if (asprintf(&tracing, "%s/tracing", debugfs) < 0)
                return NULL;
 
-       sprintf(tracing, "%s/tracing", debugfs);
-
        tracing_found = 1;
        return tracing;
 }
@@ -352,11 +349,9 @@ char *get_tracing_file(const char *name)
        if (!tracing)
                return NULL;
 
-       file = malloc(strlen(tracing) + strlen(name) + 2);
-       if (!file)
+       if (asprintf(&file, "%s/%s", tracing, name) < 0)
                return NULL;
 
-       sprintf(file, "%s/%s", tracing, name);
        return file;
 }