X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbootchart%2Fsvg.c;h=1e87fb57391af96aecea39d364506c19f5c8bd1a;hb=db5c0122853a9ecf1cc92e6593461932df2fa866;hp=a4086c52278d77250ccfa2caff1677c9a34486b1;hpb=9607d9470eec07df817e58f64d312ccb5ac4cfcc;p=elogind.git

diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index a4086c522..1e87fb573 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -389,7 +389,7 @@ static void svg_pss_graph(void) {
         svg("\n\n<!-- PSS map - csv format -->\n");
         ps = ps_first;
         while (ps->next_ps) {
-                char _cleanup_free_ *enc_name = NULL;
+                _cleanup_free_ char *enc_name = NULL;
                 ps = ps->next_ps;
                 if (!ps)
                         continue;
@@ -711,7 +711,7 @@ static int ps_filter(struct ps_struct *ps) {
 }
 
 static void svg_do_initcall(int count_only) {
-        FILE _cleanup_pclose_ *f = NULL;
+        _cleanup_pclose_ FILE *f = NULL;
         double t;
         char func[256];
         int ret;
@@ -815,7 +815,7 @@ static void svg_ps_bars(void) {
         /* pass 2 - ps boxes */
         ps = ps_first;
         while ((ps = get_next_ps(ps))) {
-                char _cleanup_free_ *enc_name = NULL;
+                _cleanup_free_ char *enc_name = NULL;
 
                 double starttime;
                 int t;
@@ -978,12 +978,11 @@ static void svg_ps_bars(void) {
 
 static void svg_top_ten_cpu(void) {
         struct ps_struct *top[10];
-        struct ps_struct emptyps;
+        struct ps_struct emptyps = {};
         struct ps_struct *ps;
         int n, m;
 
-        memset(&emptyps, 0, sizeof(struct ps_struct));
-        for (n=0; n < 10; n++)
+        for (n = 0; n < (int) ELEMENTSOF(top); n++)
                 top[n] = &emptyps;
 
         /* walk all ps's and setup ptrs */
@@ -1011,12 +1010,11 @@ static void svg_top_ten_cpu(void) {
 
 static void svg_top_ten_pss(void) {
         struct ps_struct *top[10];
-        struct ps_struct emptyps;
+        struct ps_struct emptyps = {};
         struct ps_struct *ps;
         int n, m;
 
-        memset(&emptyps, 0, sizeof(struct ps_struct));
-        for (n=0; n < 10; n++)
+        for (n = 0; n < (int) ELEMENTSOF(top); n++)
                 top[n] = &emptyps;
 
         /* walk all ps's and setup ptrs */