From: Paul Jakma <paul@quagga.net>
Date: Mon, 11 Jan 2010 16:30:45 +0000 (+0000)
Subject: lib: thread history funcname shouldn't be constant, it's freed
X-Git-Tag: frr-2.0-rc1~2132
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8526100eebf9c56ff6fac2b80938b232bb687946;p=mirror%2Ffrr.git

lib: thread history funcname shouldn't be constant, it's freed

* thread.h: (struct cpu_thread_history.funcname) malloc gets called on this
  so it should not be const
* thread.c: (cpu_record_print) cast the (const char *) to (char *), this
  function knows what it's doing (free wont be called on it).
---

diff --git a/lib/thread.c b/lib/thread.c
index e89af541c6..af52b057a6 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -303,7 +303,7 @@ cpu_record_print(struct vty *vty, thread_type filter)
   void *args[3] = {&tmp, vty, &filter};
 
   memset(&tmp, 0, sizeof tmp);
-  tmp.funcname = "TOTAL";
+  tmp.funcname = (char *)"TOTAL";
   tmp.types = filter;
 
 #ifdef HAVE_RUSAGE
diff --git a/lib/thread.h b/lib/thread.h
index b52bc541d6..937bedbb30 100644
--- a/lib/thread.h
+++ b/lib/thread.h
@@ -82,7 +82,7 @@ struct thread
 struct cpu_thread_history 
 {
   int (*func)(struct thread *);
-  const char *funcname;
+  char *funcname;
   unsigned int total_calls;
   struct time_stats
   {