diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-06-04 05:33:10 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-06-04 05:33:10 -0400 |
| commit | d8a382d2662822248a97ce9d670b90e68aefbd3a (patch) | |
| tree | 4f5bbd5d0a5881ed42de611402ea4ac2c6d6ff48 /tools/perf/util/exec_cmd.c | |
| parent | 45c34e05c4e3d36e7c44e790241ea11a1d90d54e (diff) | |
| parent | c6df8d5ab87a246942d138321e1721edbb69f6e1 (diff) | |
Merge remote branch 'tip/perf/urgent' into oprofile/urgent
Diffstat (limited to 'tools/perf/util/exec_cmd.c')
| -rw-r--r-- | tools/perf/util/exec_cmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/exec_cmd.c b/tools/perf/util/exec_cmd.c index 2745605dba11..67eeff571568 100644 --- a/tools/perf/util/exec_cmd.c +++ b/tools/perf/util/exec_cmd.c | |||
| @@ -53,8 +53,8 @@ const char *perf_extract_argv0_path(const char *argv0) | |||
| 53 | slash--; | 53 | slash--; |
| 54 | 54 | ||
| 55 | if (slash >= argv0) { | 55 | if (slash >= argv0) { |
| 56 | argv0_path = xstrndup(argv0, slash - argv0); | 56 | argv0_path = strndup(argv0, slash - argv0); |
| 57 | return slash + 1; | 57 | return argv0_path ? slash + 1 : NULL; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | return argv0; | 60 | return argv0; |
| @@ -116,7 +116,7 @@ void setup_path(void) | |||
| 116 | strbuf_release(&new_path); | 116 | strbuf_release(&new_path); |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | const char **prepare_perf_cmd(const char **argv) | 119 | static const char **prepare_perf_cmd(const char **argv) |
| 120 | { | 120 | { |
| 121 | int argc; | 121 | int argc; |
| 122 | const char **nargv; | 122 | const char **nargv; |