From b79c457ca01df82dbe1facb708e45def4584c903 Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Tue, 3 Sep 2024 21:30:31 -0700 Subject: Fix 32097 Warnings when building gprofng with Clang gprofng/ChangeLog 2024-09-03 Vladimir Mezentsev . PR gprofng/32097 * common/hwcdrv.c: Fix -Wempty-body warnings. * common/hwcentry.h: Fix -Wdeprecated-non-prototype warnings. * common/hwctable.c: Fix -Wdeprecated-non-prototype warnings. * libcollector/collector.c: Likewise. * libcollector/collector.h: Likewise. * libcollector/collectorAPI.c: Likewise. * libcollector/dispatcher.c: Likewise. * libcollector/iotrace.c: Likewise. * libcollector/libcol_util.c: Fix -Wunused-but-set-variable warnings. * libcollector/libcol_util.h: Remove unused declarations. * libcollector/linetrace.c: Fix -Wdeprecated-non-prototype warnings. * src/BaseMetricTreeNode.h: Fix -Wunused-private-field warnings. * src/Dbe.cc: Fix -Wself-assign warnings. * src/DbeSession.cc: Fix -Wunused-but-set-variable warnings. * src/Disasm.cc: Fix -Wunused-const-variable warnings. * src/Experiment.cc: Fix -Wunused-private-field warnings. * src/HashMap.h: Fix -Wself-assign warnings. * src/IOActivity.h: Fix -Wunused-private-field warnings. * src/collctrl.cc: Fix -Wself-assign, -Wparentheses-equality warnings. * src/collctrl.h: Fix -Wunused-private-field warnings. * src/collector_module.h: Fix -Wdeprecated-non-prototype warnings. * src/gp-display-src.cc: Fix -Wunused-private-field warnings. * src/gp-print.h: Fix -Wheader-guard warnings. * src/hwc_intel_icelake.h: Fix -Winitializer-overrides warnings. * src/util.cc: Fix -Wunused-but-set-variable warnings. --- gprofng/src/collctrl.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gprofng/src/collctrl.cc') diff --git a/gprofng/src/collctrl.cc b/gprofng/src/collctrl.cc index 95324fb..d341cb0 100644 --- a/gprofng/src/collctrl.cc +++ b/gprofng/src/collctrl.cc @@ -876,9 +876,7 @@ Coll_Ctrl::set_clkprof (const char *string, char** warn) double dval = strtod (string, &endchar); if (*endchar == 'm' || *endchar == 0) /* user specified milliseconds */ dval = dval * 1000.; - else if (*endchar == 'u') /* user specified microseconds */ - dval = dval; - else + else if (*endchar != 'u') return dbe_sprintf (GTXT ("Unrecognized clock-profiling interval `%s'\n"), string); nclkprof_timer = (int) (dval + 0.5); } @@ -2788,7 +2786,7 @@ Coll_Ctrl::get (char * control) } if (!strncmp (control, ipc_str_javaprof, len)) { - if ((java_mode == 0)) + if (java_mode == 0) return strdup (ipc_str_off); return strdup (ipc_str_on); } @@ -2804,7 +2802,7 @@ Coll_Ctrl::get (char * control) } if (!strncmp (control, ipc_str_sample_sig, len)) { - if ((sample_sig == 0)) + if (sample_sig == 0) return strdup (ipc_str_off); char *str_signal = find_signal_name (sample_sig); if (str_signal != NULL) @@ -2838,15 +2836,15 @@ Coll_Ctrl::get (char * control) } if (!strncmp (control, ipc_str_iotrace, len)) { - if ((iotrace_enabled == 0)) + if (iotrace_enabled == 0) return strdup (ipc_str_off); return strdup (ipc_str_on); } if (!strncmp (control, ipc_str_count, len)) { - if ((count_enabled == 0)) + if (count_enabled == 0) return strdup (ipc_str_off); - if ((count_enabled < 0)) + if (count_enabled < 0) return strdup ("on\nstatic"); return strdup (ipc_str_on); } -- cgit v1.1