BSD: mv arch C files (#1072)

* move freebsd C arch files

* rename C file

* move openbsd C arch files

* move netbsd C arch files

12 files changed, 12 insertions, 14 deletions

diff --git a/psutil/_psutil_bsd.c b/psutil/_psutil_bsd.c
index 03bdd94f..506666b4 100644
--- a/psutil/_psutil_bsd.c
+++ b/psutil/_psutil_bsd.c
@@ -63,8 +63,8 @@
 #include "_psutil_posix.h"
 
 #ifdef PSUTIL_FREEBSD
-    #include "arch/bsd/freebsd.h"
-    #include "arch/bsd/freebsd_socks.h"
+    #include "arch/freebsd/specific.h"
+    #include "arch/freebsd/socks.h"
 
     #include <net/if_media.h>
     #include <devstat.h>  // get io counters
@@ -75,7 +75,7 @@
         #include <utmpx.h>
     #endif
 #elif PSUTIL_OPENBSD
-    #include "arch/bsd/openbsd.h"
+    #include "arch/openbsd/specific.h"
 
     #include <utmp.h>
     #include <sys/vnode.h>  // for VREG
@@ -84,8 +84,8 @@
     #undef _KERNEL
     #include <sys/sched.h>  // for CPUSTATES & CP_*
 #elif PSUTIL_NETBSD
-    #include "arch/bsd/netbsd.h"
-    #include "arch/bsd/netbsd_socks.h"
+    #include "arch/netbsd/specific.h"
+    #include "arch/netbsd/socks.h"
 
     #include <utmpx.h>
     #include <sys/vnode.h>  // for VREG
diff --git a/psutil/arch/bsd/freebsd_socks.c b/psutil/arch/freebsd/socks.c
index 8fcb45e5..8fcb45e5 100644
--- a/psutil/arch/bsd/freebsd_socks.c
+++ b/psutil/arch/freebsd/socks.c
diff --git a/psutil/arch/bsd/freebsd_socks.h b/psutil/arch/freebsd/socks.h
index 15ccb0b3..15ccb0b3 100644
--- a/psutil/arch/bsd/freebsd_socks.h
+++ b/psutil/arch/freebsd/socks.h
diff --git a/psutil/arch/bsd/freebsd.c b/psutil/arch/freebsd/specific.c
index 98751c6d..46bf3868 100644
--- a/psutil/arch/bsd/freebsd.c
+++ b/psutil/arch/freebsd/specific.c
@@ -3,7 +3,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Helper functions related to fetching process information.
+ * Helper functions specific to FreeBSD.
  * Used by _psutil_bsd module methods.
  */
 
diff --git a/psutil/arch/bsd/freebsd.h b/psutil/arch/freebsd/specific.h
index 0df66ecc..0df66ecc 100644
--- a/psutil/arch/bsd/freebsd.h
+++ b/psutil/arch/freebsd/specific.h
diff --git a/psutil/arch/bsd/netbsd_socks.c b/psutil/arch/netbsd/socks.c
index bd260ad3..bd260ad3 100644
--- a/psutil/arch/bsd/netbsd_socks.c
+++ b/psutil/arch/netbsd/socks.c
diff --git a/psutil/arch/bsd/netbsd_socks.h b/psutil/arch/netbsd/socks.h
index 9e6a97c0..9e6a97c0 100644
--- a/psutil/arch/bsd/netbsd_socks.h
+++ b/psutil/arch/netbsd/socks.h
diff --git a/psutil/arch/bsd/netbsd.c b/psutil/arch/netbsd/specific.c
index 972418ff..1dc2080e 100644
--- a/psutil/arch/bsd/netbsd.c
+++ b/psutil/arch/netbsd/specific.c
@@ -38,9 +38,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-
-#include "netbsd_socks.h"
-#include "netbsd.h"
+#include "specific.h"
 #include "../../_psutil_common.h"
 #include "../../_psutil_posix.h"
 
diff --git a/psutil/arch/bsd/netbsd.h b/psutil/arch/netbsd/specific.h
index 96ad9f7d..96ad9f7d 100644
--- a/psutil/arch/bsd/netbsd.h
+++ b/psutil/arch/netbsd/specific.h
diff --git a/psutil/arch/bsd/openbsd.c b/psutil/arch/openbsd/specific.c
index 4caf6ed5..4caf6ed5 100644
--- a/psutil/arch/bsd/openbsd.c
+++ b/psutil/arch/openbsd/specific.c
diff --git a/psutil/arch/bsd/openbsd.h b/psutil/arch/openbsd/specific.h
index 4f870268..4f870268 100644
--- a/psutil/arch/bsd/openbsd.h
+++ b/psutil/arch/openbsd/specific.h
diff --git a/setup.py b/setup.py
index d51b82fe..af96cf4b 100755
--- a/setup.py
+++ b/setup.py
@@ -168,8 +168,8 @@ elif FREEBSD:
         'psutil._psutil_bsd',
         sources=sources + [
             'psutil/_psutil_bsd.c',
-            'psutil/arch/bsd/freebsd.c',
-            'psutil/arch/bsd/freebsd_socks.c',
+            'psutil/arch/freebsd/specific.c',
+            'psutil/arch/freebsd/socks.c',
         ],
         define_macros=macros,
         libraries=["devstat"])
@@ -180,7 +180,7 @@ elif OPENBSD:
         'psutil._psutil_bsd',
         sources=sources + [
             'psutil/_psutil_bsd.c',
-            'psutil/arch/bsd/openbsd.c',
+            'psutil/arch/openbsd/specific.c',
         ],
         define_macros=macros,
         libraries=["kvm"])
@@ -191,8 +191,8 @@ elif NETBSD:
         'psutil._psutil_bsd',
         sources=sources + [
             'psutil/_psutil_bsd.c',
-            'psutil/arch/bsd/netbsd.c',
-            'psutil/arch/bsd/netbsd_socks.c',
+            'psutil/arch/netbsd/specific.c',
+            'psutil/arch/netbsd/socks.c',
         ],
         define_macros=macros,
         libraries=["kvm"])