Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/procps/powertop.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/procps/powertop.c (modified) (9 diffs)

branches/3.3/mindi-busybox/procps/powertop.c

@@ -361 +361 @@
 
         name = p;
-        strchrnul(name, '\n')[0] = '\0';
+        chomp(p);
         /* Save description of the interrupt */
         if (nr >= 20000)
@@ -459 +459 @@
             //}
 
-            if (strncmp(func, "tick_nohz_", 10) == 0)
-                continue;
-            if (strncmp(func, "tick_setup_sched_timer", 20) == 0)
+            if (is_prefixed_with(func, "tick_nohz_"))
+                continue;
+            if (is_prefixed_with(func, "tick_setup_sched_timer"))
                 continue;
             //if (strcmp(process, "powertop") == 0)
@@ -471 +471 @@
             }
 
-            strchrnul(p, '\n')[0] = '\0';
+            chomp(p);
 
             // 46D\01136\0kondemand/1\0do_dbs_timer (delayed_work_timer_fn)
@@ -592 +592 @@
         return;
 
-    printf("Your CPU supports the following C-states: ");
+    printf("Your %s the following C-states: ", "CPU supports");
     i = 0;
     while (edx) {
@@ -603 +603 @@
 
     /* Print BIOS C-States */
-    printf("Your BIOS reports the following C-states: ");
+    printf("Your %s the following C-states: ", "BIOS reports");
     for (i = 0; i < ARRAY_SIZE(bios_table); i++)
         if (bios_table[i])
@@ -628 +628 @@
         char strbuf6[6];
 
-        strbuf6[5] = '\0';
         puts("\nTop causes for wakeups:");
         for (i = 0; i < G.lines_cnt; i++) {
@@ -640 +639 @@
                 if (G.lines[i].disk_count)
                     c = 'D';*/
-                smart_ulltoa5(G.lines[i].count, strbuf6, " KMGTPEZY");
+                smart_ulltoa5(G.lines[i].count, strbuf6, " KMGTPEZY")[0] = '\0';
                 printf(/*" %5.1f%% (%s)%c  %s\n"*/
                     " %5.1f%% (%s)   %s\n",
@@ -676 +675 @@
 //usage:       ""
 //usage:#define powertop_full_usage "\n\n"
-//usage:       "Analyze power consumption on Intel-based laptops\n"
+//usage:       "Analyze power consumption on Intel-based laptops"
 
 int powertop_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -706 +705 @@
     G.total_cpus = get_cpu_count();
 
-    printf("Collecting data for "DEFAULT_SLEEP_STR" seconds\n");
+    puts("Collecting data for "DEFAULT_SLEEP_STR" seconds");
 
 #if ENABLE_FEATURE_USE_TERMIOS