library: don't strip off prefixes from the wchan names

This commit will resolve the RedHat Bugzilla #1322111.

[ import from identical commit against master branch ]
[ but without trailing whitespace, thank you so much ]

Imported by: Jim Warner <james.warner@comcast.net>

diff --git a/NEWS b/NEWS
index 06541e88de65cf99d80c05acc9ac557bedb479fd..5b5a49f0c9005ed753c5dee4242d46a79d126c75 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ procps-ng-NEXT
   * pmap: fix duplicate output line under '-x' option      Redhat #1374061
   * top: eliminated minor libnuma memory leak
   * ps: avoid eip/esp address truncations                  Debain #846361
+  * library: don't strip off wchan prefixes (ps & top)     Redhat #1322111
 
 procps-ng-3.3.12
 ----------------

diff --git a/proc/wchan.c b/proc/wchan.c
index b4e40fe1b8ef3c8a26ae3f714d6767903085e4d0..873a70629bd9052e7c478db3430f74505d104290 100644 (file)
--- a/proc/wchan.c
+++ b/proc/wchan.c
@@ -46,11 +46,7 @@ const char * lookup_wchan (int pid) {
 
    // lame ppc64 has a '.' in front of every name
    if (*ret=='.') ret++;
-   switch (*ret){
-      case 's': if(!strncmp(ret, "sys_", 4)) ret += 4; break;
-      case 'd': if(!strncmp(ret, "do_",  3)) ret += 3; break;
-      case '_': while(*ret=='_') ret++;                break;
-      default :                                        break;
-   }
+   while(*ret=='_') ret++;
+
    return ret;
 }