Remove unused functions because of porting issues.

itagaki.takahiro · itagaki.takahiro · commit 6545c64ca8dd · 2009-12-16T00:40:22.000Z
They are used by another project, but not used by pg_rman. git-svn-id: http://pg-rman.googlecode.com/svn/trunk@18 182aca00-e38e-11de-a668-6fd11605f5ce
diff --git a/pgut/pgut-port.c b/pgut/pgut-port.c
@@ -14,79 +14,6 @@
 
 #include <winioctl.h>
 
-int
-uname(struct utsname *buf)
-{
-	OSVERSIONINFO	os = { sizeof(OSVERSIONINFO) };
-	SYSTEM_INFO		sys = { { sizeof(SYSTEM_INFO) } };
-	DWORD			bufsize;
-
-	GetVersionEx(&os);
-	GetSystemInfo(&sys);
-
-	/* sysname */
-	strcpy(buf->sysname, "Windows");
-
-	/* nodename */
-	bufsize = lengthof(buf->nodename);
-	GetComputerName(buf->nodename, &bufsize);
-
-	/* release: major.minor */
-	snprintf(buf->release, lengthof(buf->release), "%ld.%ld",
-		os.dwMajorVersion, os.dwMinorVersion);
-
-	/* version */
-	strcpy(buf->sysname, os.szCSDVersion);
-
-	/* machine */
-	switch (sys.wProcessorArchitecture)
-	{
-	case PROCESSOR_ARCHITECTURE_INTEL:
-		strcpy(buf->machine, "x86");
-		break;
-	case PROCESSOR_ARCHITECTURE_IA64:
-		strcpy(buf->machine, "IA64");
-		break;
-	case PROCESSOR_ARCHITECTURE_AMD64:
-		strcpy(buf->machine, "x86_64");
-		break;
-	case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
-		strcpy(buf->machine, "x86_on_win64");
-		break;
-	default:
-		strcpy(buf->machine, "unknown");
-		break;
-	}
-
-	return 0;
-}
-
-#define NTFS_BLOCK_SIZE		512
-
-int
-statfs(const char *path, struct statfs *buf)
-{
-	ULARGE_INTEGER	availBytes;
-	ULARGE_INTEGER	totalBytes;
-	ULARGE_INTEGER	freeBytes;
-
-	if (!GetDiskFreeSpaceEx(path, &availBytes, &totalBytes, &freeBytes))
-	{
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	memset(buf, 0, sizeof(struct statfs));
-	buf->f_type = NTFS_SB_MAGIC;
-	buf->f_bsize = NTFS_BLOCK_SIZE;
-	buf->f_blocks = (long) (totalBytes.QuadPart / NTFS_BLOCK_SIZE);
-	buf->f_bfree = (long) (freeBytes.QuadPart / NTFS_BLOCK_SIZE);
-	buf->f_bavail = (long) (availBytes.QuadPart / NTFS_BLOCK_SIZE);
-	buf->f_namelen = MAX_PATH;
-
-	return 0;
-}
-
 #define REPARSE_DATA_SIZE		1024
 
 /* same layout as REPARSE_DATA_BUFFER, which is defined only in old winnt.h */
@@ -192,20 +119,6 @@ readlink(const char *path, char *target, size_t size)
 	return r;
 }
 
-char *
-blkid_devno_to_devname(dev_t devno)
-{
-	static char	devname[4];
-	char		letter = 'A' + devno;
-	if ('A' <= letter && letter <= 'Z')
-	{
-		snprintf(devname, lengthof(devname), "%c:\\", 'A' + devno);
-		return devname;
-	}
-	else
-		return NULL;
-}
-
 int
 flock(int fd, int operation)
 {
diff --git a/pgut/pgut-port.h b/pgut/pgut-port.h
@@ -10,62 +10,21 @@
 #ifndef PGUT_PORT_H
 #define PGUT_PORT_H
 
-#include <sys/stat.h>
-
-#ifndef WIN32
-
-#include <blkid/blkid.h>
-#include <sys/utsname.h>
-#include <sys/statfs.h>
-#include <unistd.h>
-
-#else
-
-#include <time.h>
-
-struct utsname
-{
-	char	sysname[32];
-	char	nodename[256];
-	char	release[128];
-	char	version[128];
-	char	machine[32];
-};
-
-#define NTFS_SB_MAGIC	0x5346544e
-
-typedef struct { int val[2]; } fsid_t;
-
-struct statfs
-{
-	long	f_type;
-	long	f_bsize;
-	long	f_blocks;
-	long	f_bfree;
-	long	f_bavail;
-	long	f_files;
-	long	f_ffree;
-	fsid_t	f_fsid;
-	long	f_namelen;
-};
-
-extern int uname(struct utsname *buf);
-extern int statfs(const char *path, struct statfs *buf);
-extern ssize_t readlink(const char *path, char *target, size_t size);
-extern char *blkid_devno_to_devname(dev_t devno);
+#ifdef WIN32
 
 #define LOCK_SH		1	/* Shared lock.  */
 #define LOCK_EX		2	/* Exclusive lock.  */
 #define LOCK_UN		8	/* Unlock.  */
 #define LOCK_NB		4	/* Don't block when locking.  */
 
-extern int flock(int fd, int operation);
-
 #define S_IFLNK			(0)
 #define S_IRWXG			(0)
 #define S_IRWXO			(0)
 #define S_ISLNK(mode)	(0)
 
+extern int flock(int fd, int operation);
+extern ssize_t readlink(const char *path, char *target, size_t size);
+
 #endif
 
 #endif   /* PGUT_PORT_H */
diff --git a/pgut/pgut.c b/pgut/pgut.c
@@ -1080,7 +1080,7 @@ pgut_wait(int num, PGconn *connections[], struct timeval *timeout)
 		for (i = 0; i < num; i++)
 		{
 			int	sock;
-			
+
 			if (connections[i] == NULL)
 				continue;
 			sock = PQsocket(connections[i]);

Original file line number	Diff line number	Diff line change
`@@ -1080,7 +1080,7 @@ pgut_wait(int num, PGconn connections[], struct timeval timeout)`
`1080`	`1080`	`for (i = 0; i < num; i++)`
`1081`	`1081`	`{`
`1082`	`1082`	`int sock;`
`1083`		`-`
	`1083`	`+`
`1084`	`1084`	`if (connections[i] == NULL)`
`1085`	`1085`	`continue;`
`1086`	`1086`	`sock = PQsocket(connections[i]);`