diff options
| author | hunt <hunt> | 2005-08-03 19:38:43 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2005-08-03 19:38:43 +0000 |
| commit | 085efacada12da5f795db776c59af1874e9ee440 (patch) | |
| tree | acad4e5c336af02efdbe81b4d5f6741632b328cc /runtime/stpd | |
| parent | 4515ee3f0e745fde9117baf36c5053216326c9a7 (diff) | |
| download | systemtap-steved-085efacada12da5f795db776c59af1874e9ee440.tar.gz systemtap-steved-085efacada12da5f795db776c59af1874e9ee440.tar.xz systemtap-steved-085efacada12da5f795db776c59af1874e9ee440.zip | |
2005-08-03 Martin Hunt <hunt@redhat.com>
* librelay.c (init_stp): Change variable name to eliminate shadow warning.
Diffstat (limited to 'runtime/stpd')
| -rw-r--r-- | runtime/stpd/ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/stpd/librelay.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/runtime/stpd/ChangeLog b/runtime/stpd/ChangeLog index de453759..1347311b 100644 --- a/runtime/stpd/ChangeLog +++ b/runtime/stpd/ChangeLog @@ -1,5 +1,7 @@ 2005-08-03 Martin Hunt <hunt@redhat.com> + * librelay.c (init_stp): Change variable name to eliminate shadow warning. +2005-08-03 Martin Hunt <hunt@redhat.com> * librelay.c (open_control_channel): Set the receive buffer to 512K, or the max allowed. diff --git a/runtime/stpd/librelay.c b/runtime/stpd/librelay.c index bca63e6e..43a4b169 100644 --- a/runtime/stpd/librelay.c +++ b/runtime/stpd/librelay.c @@ -469,7 +469,7 @@ int init_stp(const char *relay_filebase, int print_summary) char buf[1024]; struct transport_info ti; pid_t pid; - int status; + int rstatus; ncpus = sysconf(_SC_NPROCESSORS_ONLN); print_totals = print_summary; @@ -482,11 +482,11 @@ int init_stp(const char *relay_filebase, int print_summary) if (execl("/sbin/insmod", "insmod", modname, buf, NULL) < 0) exit(-1); } - if (waitpid(pid, &status, 0) < 0) { + if (waitpid(pid, &rstatus, 0) < 0) { perror("waitpid"); exit(-1); } - if (WIFEXITED(status) && WEXITSTATUS(status)) { + if (WIFEXITED(rstatus) && WEXITSTATUS(rstatus)) { perror ("insmod"); fprintf(stderr, "ERROR, couldn't insmod probe module %s\n", modname); return -1; |