Merge branch 'cgzones-ci2'

.github/workflows/ci.yml

@@ -1,22 +1,22 @@
 name: CI
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [ push, pull_request ]
 
 jobs:
   build-ubuntu-latest:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - name: Install Dependencies
+      run: sudo apt-get install libncursesw5-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror
     - name: Build
-      run: |
-        sudo apt-get install libncursesw5-dev
-        ./autogen.sh
-        ./configure
-        make
+      run: make
+    - name: Distcheck
+      run: make distcheck
 
 #  build-macos-latest:
 #    runs-on: macos-latest
@@ -27,3 +27,12 @@ jobs:
 #        ./autogen.sh
 #        ./configure
 #        make
+
+  whitespace_check:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: check-whitespaces
+        run: git diff-tree --check $(git hash-object -t tree /dev/null) HEAD

Action.c

@@ -615,4 +615,3 @@ void Action_setBindings(Htop_Action* keys) {
    keys['c'] = actionTagAllChildren;
    keys['e'] = actionShowEnvScreen;
 }
-

CONTRIBUTING.md

@@ -53,4 +53,3 @@ Donations
 
 If you like htop, feel free to [buy the author a
 beer](http://hisham.hm/htop/index.php?page=donate). :-)
-

COPYING

@@ -353,4 +353,3 @@ Public License instead of this License.
  applicable licenses of the version of PLPA used in your combined work,
  provided that you include the source code of such version of PLPA when
  and as the GNU GPL requires distribution of source code.
-

ColumnsPanel.c

@@ -164,4 +164,3 @@ void ColumnsPanel_update(Panel* super) {
    }
    this->settings->fields[size] = 0;
 }
-

ListItem.c

@@ -85,4 +85,3 @@ long ListItem_compare(const void* cast1, const void* cast2) {
    ListItem* obj2 = (ListItem*) cast2;
    return strcmp(obj1->value, obj2->value);
 }
-

Makefile.am

@@ -12,7 +12,7 @@ applications_DATA = htop.desktop
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = htop.png
 
-AM_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"
+AM_CFLAGS += -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)"
 AM_LDFLAGS =
 AM_CPPFLAGS = -DNDEBUG
 

NEWS

@@ -2,4 +2,3 @@
 See the commit history for news of the past.
 See the bug tracker for news of the future.
 Run the program for news of the present.
-

TESTPLAN

@@ -152,4 +152,3 @@ STrace screen:
 LSOF screen:
 
    TODO
-   

XAlloc.c

@@ -14,7 +14,7 @@
 #include <stdlib.h>
 }*/
 
-static inline void fail() {
+void fail() {
    curs_set(1);
    endwin();
    err(1, NULL);
@@ -44,6 +44,10 @@ void* xRealloc(void* ptr, size_t size) {
    return data;
 }
 
+#undef xAsprintf
+
+#define xAsprintf(strp, fmt, ...) do { int _r=asprintf(strp, fmt, __VA_ARGS__); if (_r < 0) { fail(); } } while(0)
+
 #define xSnprintf(fmt, len, ...) do { int _l=len; int _n=snprintf(fmt, _l, __VA_ARGS__); if (!(_n > -1 && _n < _l)) { curs_set(1); endwin(); err(1, NULL); } } while(0)
 
 #undef xStrdup

XAlloc.h

@@ -11,12 +11,18 @@
 #include <assert.h>
 #include <stdlib.h>
 
+extern void fail(void);
+
 extern void* xMalloc(size_t size);
 
 extern void* xCalloc(size_t nmemb, size_t size);
 
 extern void* xRealloc(void* ptr, size_t size);
 
+#undef xAsprintf
+
+#define xAsprintf(strp, fmt, ...) do { int _r=asprintf(strp, fmt, __VA_ARGS__); if (_r < 0) { fail(); } } while(0)
+
 #define xSnprintf(fmt, len, ...) do { int _l=len; int _n=snprintf(fmt, _l, __VA_ARGS__); if (!(_n > -1 && _n < _l)) { curs_set(1); endwin(); err(1, NULL); } } while(0)
 
 #undef xStrdup

configure.ac

@@ -295,6 +295,9 @@ then
    ])
 fi
 
+AC_ARG_ENABLE([werror], [AS_HELP_STRING([--enable-werror], [Treat warnings as errors (default: warnings are not errors)])], [enable_werror="$enableval"], [enable_werror=no])
+AS_IF([test "x$enable_werror" = "xyes"], [AM_CFLAGS="$AM_CFLAGS -Werror"])
+AC_SUBST([AM_CFLAGS])
 
 # Bail out on errors.
 # ----------------------------------------------------------------------

darwin/Battery.c

@@ -72,4 +72,3 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
       CFRelease(power_sources);
    }
 }
-

darwin/DarwinCRT.c

@@ -32,4 +32,3 @@ void CRT_handleSIGSEGV(int sgn) {
    #endif
    abort();
 }
-

dragonflybsd/DragonFlyBSDCRT.c

@@ -32,4 +32,3 @@ void CRT_handleSIGSEGV(int sgn) {
    #endif
    abort();
 }
-

freebsd/FreeBSDCRT.c

@@ -18,4 +18,3 @@ void CRT_handleSIGSEGV(int sgn) {
    fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
    abort();
 }
-

linux/IOPriority.c

@@ -38,4 +38,3 @@ typedef int IOPriority;
 #define IOPriority_Idle IOPriority_tuple(IOPRIO_CLASS_IDLE, 7)
 
 }*/
-

linux/IOPriorityPanel.c

@@ -41,4 +41,3 @@ Panel* IOPriorityPanel_new(IOPriority currPrio) {
 IOPriority IOPriorityPanel_getIOPriority(Panel* this) {
    return (IOPriority) ( ((ListItem*) Panel_getSelected(this))->key );
 }
-

linux/LinuxProcess.c

@@ -514,4 +514,3 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
 bool Process_isThread(Process* this) {
    return (Process_isUserlandThread(this) || Process_isKernelThread(this));
 }
-

linux/LinuxProcessList.c

@@ -822,11 +822,11 @@ static char* LinuxProcessList_updateTtyDevice(TtyDriver* ttyDrivers, unsigned in
       struct stat sstat;
       char* fullPath;
       for(;;) {
-         asprintf(&fullPath, "%s/%d", ttyDrivers[i].path, idx);
+         xAsprintf(&fullPath, "%s/%d", ttyDrivers[i].path, idx);
          int err = stat(fullPath, &sstat);
          if (err == 0 && major(sstat.st_rdev) == maj && minor(sstat.st_rdev) == min) return fullPath;
          free(fullPath);
-         asprintf(&fullPath, "%s%d", ttyDrivers[i].path, idx);
+         xAsprintf(&fullPath, "%s%d", ttyDrivers[i].path, idx);
          err = stat(fullPath, &sstat);
          if (err == 0 && major(sstat.st_rdev) == maj && minor(sstat.st_rdev) == min) return fullPath;
          free(fullPath);
@@ -837,7 +837,7 @@ static char* LinuxProcessList_updateTtyDevice(TtyDriver* ttyDrivers, unsigned in
       if (err == 0 && tty_nr == sstat.st_rdev) return strdup(ttyDrivers[i].path);
    }
    char* out;
-   asprintf(&out, "/dev/%u:%u", maj, min);
+   xAsprintf(&out, "/dev/%u:%u", maj, min);
    return out;
 }
 

openbsd/OpenBSDCRT.c

@@ -19,4 +19,3 @@ void CRT_handleSIGSEGV(int sgn) {
    fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
    abort();
 }
-

openbsd/OpenBSDProcessList.c

@@ -400,4 +400,3 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    OpenBSDProcessList_scanProcs(opl);
    OpenBSDProcessList_scanCPUTime(opl);
 }
-

scripts/MakeHeader.py

@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-import os, sys, string, io
+#!/usr/bin/env python3
+import os, sys, io
 try:
    from StringIO import StringIO
 except ImportError:

solaris/Battery.c

@@ -5,4 +5,3 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
    *level = -1;
    *isOnAC = AC_ERROR;
 }
-

solaris/SolarisProcessList.c

@@ -419,4 +419,3 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    this->kernelThreads = 1;
    proc_walk(&SolarisProcessList_walkproc, this, PR_WALK_LWP);
 }
-

test_spec.lua

@@ -685,4 +685,3 @@ describe("htop test suite", function()
       os.execute("make lcov && xdg-open lcov/index.html")
    end)
 end)
-

unsupported/Battery.c

@@ -5,4 +5,3 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
    *level = -1;
    *isOnAC = AC_ERROR;
 }
-

unsupported/UnsupportedCRT.c

@@ -18,4 +18,3 @@ void CRT_handleSIGSEGV(int sgn) {
    fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
    abort();
 }
-

unsupported/UnsupportedProcess.c

@@ -30,4 +30,3 @@ void UnsupportedProcess_delete(Object* cast) {
    // free platform-specific fields here
    free(this);
 }
-

zfs/ZfsArcStats.c

@@ -20,3 +20,5 @@ typedef struct ZfsArcStats_ {
    unsigned long long int uncompressed;
 } ZfsArcStats;
 }*/
+
+static int make_iso_compilers_happy __attribute__((unused));

zfs/ZfsArcStats.h

@@ -23,4 +23,5 @@ typedef struct ZfsArcStats_ {
    unsigned long long int uncompressed;
 } ZfsArcStats;
 
+
 #endif