Mercurial > illumos > illumos-gate
changeset 13929:cb100869484a
749 "/usr/bin/kstat" should be rewritten in C (fix SPARC build)
| author | Richard Lowe <richlowe@richlowe.net> |
|---|---|
| date | Sun, 27 Jan 2013 03:02:37 +0000 |
| parents | b13e6c26bd03 |
| children | f2303e5259ca |
| files | usr/src/cmd/stat/kstat/Makefile usr/src/cmd/stat/kstat/kstat.c usr/src/cmd/stat/kstat/kstat.h |
| diffstat | 3 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/stat/kstat/Makefile Wed Jan 09 12:18:53 2013 +0000 +++ b/usr/src/cmd/stat/kstat/Makefile Sun Jan 27 03:02:37 2013 +0000 @@ -35,6 +35,11 @@ CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses + +CPPFLAGS_sparc += -I$(SRC)/uts/sfmmu +CPPFLAGS_sparc += -I$(SRC)/uts/sun4u/sunfire +CPPFLAGS += $(CPPFLAGS_$(MACH)) + FILEMODE= 0555 lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
--- a/usr/src/cmd/stat/kstat/kstat.c Wed Jan 09 12:18:53 2013 +0000 +++ b/usr/src/cmd/stat/kstat/kstat.c Sun Jan 27 03:02:37 2013 +0000 @@ -1261,15 +1261,15 @@ for (; len > 1; len--, shortp++) { if (list == NULL) { - (void) asprintf(&list_buf, "%d,", *shortp); + (void) asprintf(&list_buf, "%hd,", *shortp); } else { - (void) asprintf(&list_buf, "%s%d,", list, *shortp); + (void) asprintf(&list_buf, "%s%hd,", list, *shortp); free(list); } list = list_buf; } - (void) asprintf(&list_buf, "%s%s", list, *shortp); + (void) asprintf(&list_buf, "%s%hd", list, *shortp); free(list); return (list_buf); } @@ -1279,7 +1279,6 @@ { struct temp_stats *temps = (struct temp_stats *)(kp->ks_data); char *buf; - int n = 1; assert(kp->ks_data_size == sizeof (struct temp_stats)); @@ -1381,7 +1380,7 @@ (void) snprintf(name, sizeof (name), "create_time_%d", i); SAVE_HRTIME_X(ksi, name, fault->create_time); (void) snprintf(name, sizeof (name), "msg_%d", i); - SAVE_STRING_X(ksi, name, faultp->msg); + SAVE_STRING_X(ksi, name, fault->msg); } } #endif
--- a/usr/src/cmd/stat/kstat/kstat.h Wed Jan 09 12:18:53 2013 +0000 +++ b/usr/src/cmd/stat/kstat/kstat.h Sun Jan 27 03:02:37 2013 +0000 @@ -150,7 +150,7 @@ #define SAVE_CHAR_X(I, N, V) \ { \ ks_value_t v; \ - asprintf(&v.str.addr.ptr, "%c", V); \ + (void) asprintf(&v.str.addr.ptr, "%c", V); \ v.str.len = 1; \ nvpair_insert(I, N, &v, KSTAT_DATA_STRING); \ }