svn commit: r195721 - projects/libprocstat/usr.bin/fstat

[Stanislav Sedov]

Author: stas
Date: Thu Jul 16 16:38:41 2009
New Revision: 195721
URL: http://svn.freebsd.org/changeset/base/195721

Log:
  - Move libprocstat structures definition to the appropriate header.

Modified:
  projects/libprocstat/usr.bin/fstat/cd9660.c
  projects/libprocstat/usr.bin/fstat/common_kvm.c
  projects/libprocstat/usr.bin/fstat/common_kvm.h
  projects/libprocstat/usr.bin/fstat/fstat.c
  projects/libprocstat/usr.bin/fstat/libprocstat.c
  projects/libprocstat/usr.bin/fstat/libprocstat.h
  projects/libprocstat/usr.bin/fstat/msdosfs.c
  projects/libprocstat/usr.bin/fstat/zfs.c

Modified: projects/libprocstat/usr.bin/fstat/cd9660.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/cd9660.c	Thu Jul 16 15:39:54 2009	(r195720)
+++ projects/libprocstat/usr.bin/fstat/cd9660.c	Thu Jul 16 16:38:41 2009	(r195721)
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <kvm.h>
 #include <stdio.h>
 
+#include "libprocstat.h"
 #include "common_kvm.h"
 
 int

Modified: projects/libprocstat/usr.bin/fstat/common_kvm.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/common_kvm.c	Thu Jul 16 15:39:54 2009	(r195720)
+++ projects/libprocstat/usr.bin/fstat/common_kvm.c	Thu Jul 16 16:38:41 2009	(r195721)
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <stddef.h>
 #include <string.h>
 
+#include "libprocstat.h"
 #include "common_kvm.h"
 
 int

Modified: projects/libprocstat/usr.bin/fstat/common_kvm.h
==============================================================================
--- projects/libprocstat/usr.bin/fstat/common_kvm.h	Thu Jul 16 15:39:54 2009	(r195720)
+++ projects/libprocstat/usr.bin/fstat/common_kvm.h	Thu Jul 16 16:38:41 2009	(r195721)
@@ -29,52 +29,6 @@
 #ifndef	__COMMON_KVM_H__
 #define	__COMMON_KVM_H__
 
-struct filestat {
-	int	fs_type;	/* Descriptor type. */
-	int	fs_flags;	/* filestat specific flags. */
-	int	fs_fflags;	/* Descriptor access flags. */
-	int	fs_fd;		/* File descriptor number. */
-	void	*fs_typedep;	/* Type dependent data. */
-	STAILQ_ENTRY(filestat)	next;
-};
-
-struct vnstat {
-	dev_t	vn_dev;
-	char	vn_devname[SPECNAMELEN + 1];
-	int	vn_type;
-	long	vn_fsid;
-	long	vn_fileid;
-	mode_t	vn_mode;
-	u_long	vn_size;
-	char	*mntdir;
-};
-
-struct ptsstat {
-	dev_t	dev;
-	char	devname[SPECNAMELEN + 1];
-};
-
-struct pipestat {
-	caddr_t	addr;
-	caddr_t	peer;
-	size_t	buffer_cnt;
-};
-
-struct sockstat {
-	int	type;
-	int	proto;
-	int	dom_family;
-	caddr_t	so_addr;
-	caddr_t	so_pcb;
-	caddr_t	inp_ppcb;
-	caddr_t	unp_conn;
-	int	so_snd_sb_state;
-	int	so_rcv_sb_state;
-	char	dname[32];
-};
-
-STAILQ_HEAD(filestat_list, filestat);
-
 dev_t	dev2udev(kvm_t *kd, struct cdev *dev);
 int	kdevtoname(kvm_t *kd, struct cdev *dev, char *);
 int	kvm_read_all(kvm_t *kd, unsigned long addr, void *buf,

Modified: projects/libprocstat/usr.bin/fstat/fstat.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/fstat.c	Thu Jul 16 15:39:54 2009	(r195720)
+++ projects/libprocstat/usr.bin/fstat/fstat.c	Thu Jul 16 16:38:41 2009	(r195721)
@@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <netdb.h>
 
-#include "common_kvm.h"
 #include "functions.h"
 #include "libprocstat.h"
 

Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/libprocstat.c	Thu Jul 16 15:39:54 2009	(r195720)
+++ projects/libprocstat/usr.bin/fstat/libprocstat.c	Thu Jul 16 16:38:41 2009	(r195721)
@@ -92,8 +92,8 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <netdb.h>
 
-#include "common_kvm.h"
 #include "libprocstat.h"
+#include "common_kvm.h"
 
 /*
  * Vnode-to-filestat types translation table.

Modified: projects/libprocstat/usr.bin/fstat/libprocstat.h
==============================================================================
--- projects/libprocstat/usr.bin/fstat/libprocstat.h	Thu Jul 16 15:39:54 2009	(r195720)
+++ projects/libprocstat/usr.bin/fstat/libprocstat.h	Thu Jul 16 16:38:41 2009	(r195721)
@@ -82,6 +82,47 @@ struct procstat {
         int     type;
         kvm_t   *kd;
 };
+struct filestat {
+	int	fs_type;	/* Descriptor type. */
+	int	fs_flags;	/* filestat specific flags. */
+	int	fs_fflags;	/* Descriptor access flags. */
+	int	fs_fd;		/* File descriptor number. */
+	void	*fs_typedep;	/* Type dependent data. */
+	STAILQ_ENTRY(filestat)	next;
+};
+struct vnstat {
+	dev_t	vn_dev;
+	char	vn_devname[SPECNAMELEN + 1];
+	int	vn_type;
+	long	vn_fsid;
+	long	vn_fileid;
+	mode_t	vn_mode;
+	u_long	vn_size;
+	char	*mntdir;
+};
+struct ptsstat {
+	dev_t	dev;
+	char	devname[SPECNAMELEN + 1];
+};
+struct pipestat {
+	caddr_t	addr;
+	caddr_t	peer;
+	size_t	buffer_cnt;
+};
+struct sockstat {
+	int	type;
+	int	proto;
+	int	dom_family;
+	caddr_t	so_addr;
+	caddr_t	so_pcb;
+	caddr_t	inp_ppcb;
+	caddr_t	unp_conn;
+	int	so_snd_sb_state;
+	int	so_rcv_sb_state;
+	char	dname[32];
+};
+
+STAILQ_HEAD(filestat_list, filestat);
 
 void	procstat_close(struct procstat *procstat);
 struct filestat_list	*procstat_getfiles(struct procstat *procstat,

Modified: projects/libprocstat/usr.bin/fstat/msdosfs.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/msdosfs.c	Thu Jul 16 15:39:54 2009	(r195720)
+++ projects/libprocstat/usr.bin/fstat/msdosfs.c	Thu Jul 16 16:38:41 2009	(r195721)
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
  */
 #define VTODE(vp) ((struct denode *)(vp)->v_data)
 
+#include "libprocstat.h"
 #include "common_kvm.h"
 
 struct dosmount {

Modified: projects/libprocstat/usr.bin/fstat/zfs.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/zfs.c	Thu Jul 16 15:39:54 2009	(r195720)
+++ projects/libprocstat/usr.bin/fstat/zfs.c	Thu Jul 16 16:38:41 2009	(r195721)
@@ -50,6 +50,7 @@
 #include <stdlib.h>
 
 #define ZFS
+#include "libprocstat.h"
 #include "common_kvm.h"
 
 /*