Fix typo and cleanup.

itagaki.takahiro · itagaki.takahiro · commit 182444045cb8 · 2009-12-22T22:47:10.000Z
git-svn-id: http://pg-rman.googlecode.com/svn/trunk@26 182aca00-e38e-11de-a668-6fd11605f5ce
diff --git a/dir.c b/dir.c
@@ -39,7 +39,7 @@ dir_create_dir(const char *dir, mode_t mode)
 	char *parent;
 
 	strncpy(copy, dir, MAXPGPATH);
-	parent= dirname(copy);
+	parent = dirname(copy);
 	if (access(parent, F_OK) == -1)
 		dir_create_dir(parent, mode);
 	if (mkdir(dir, mode) == -1)
diff --git a/pg_rman.h b/pg_rman.h
@@ -95,7 +95,7 @@ typedef enum BackupStatus
 typedef enum BackupMode
 {
 	BACKUP_MODE_INVALID,
-	BACKUP_MODE_ARCHIVE,		/* arhicve only */
+	BACKUP_MODE_ARCHIVE,		/* archive only */
 	BACKUP_MODE_INCREMENTAL,	/* incremental backup */
 	BACKUP_MODE_FULL			/* full backup */
 } BackupMode;
@@ -280,6 +280,7 @@ extern bool is_pg_running(void);
 		else \
 			(logSeg)++; \
 	} while (0)
+
 #define MAXFNAMELEN		64
 #define XLogFileName(fname, tli, log, seg)	\
 	snprintf(fname, MAXFNAMELEN, "%08X%08X%08X", tli, log, seg)
diff --git a/restore.c b/restore.c
@@ -281,7 +281,7 @@ do_restore(const char *target_time,
 		elog(INFO, _("restore complete. Recovery starts automatically when the PostgreSQL server is started."));
 
 	return 0;
-}
+}	
 
 /*
  * Validate and restore backup.
@@ -327,15 +327,15 @@ restore_database(pgBackup *backup)
 
 		/* keep orginal directory */
 		if (getcwd(pwd, sizeof(pwd)) == NULL)
-			elog(ERROR_SYSTEM, _("can't get current working directoryh: %s"),
+			elog(ERROR_SYSTEM, _("can't get current working directory: %s"),
 				strerror(errno));
 
 		/* create pgdata directory */
 		dir_create_dir(pgdata, DIR_PERMISSION);
 
 		/* change directory to pgdata */
 		if (chdir(pgdata))
-			elog(ERROR_SYSTEM, _("can't change directoryh: %s"),
+			elog(ERROR_SYSTEM, _("can't change directory: %s"),
 				strerror(errno));
 
 		/* Execute mkdirs.sh */
@@ -346,7 +346,7 @@ restore_database(pgBackup *backup)
 
 		/* go back to original directory */
 		if (chdir(pwd))
-			elog(ERROR_SYSTEM, _("can't change directoryh: %s"),
+			elog(ERROR_SYSTEM, _("can't change directory: %s"),
 				strerror(errno));
 	}
 
diff --git a/xlog.c b/xlog.c
@@ -104,12 +104,12 @@ bool
 xlog_logfname2lsn(const char *logfname, XLogRecPtr *lsn)
 {
 	uint32 tli;
+
 	if (sscanf(logfname, "%08X%08X%08X",
 			&tli, &lsn->xlogid, &lsn->xrecoff) != 3)
 		return false;
 
 	lsn->xrecoff *= XLogSegSize;
-
 	return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,12 @@ bool`
`104`	`104`	`xlog_logfname2lsn(const char logfname, XLogRecPtr lsn)`
`105`	`105`	`{`
`106`	`106`	`uint32 tli;`
	`107`	`+`
`107`	`108`	`if (sscanf(logfname, "%08X%08X%08X",`
`108`	`109`	`&tli, &lsn->xlogid, &lsn->xrecoff) != 3)`
`109`	`110`	`return false;`
`110`	`111`
`111`	`112`	`lsn->xrecoff *= XLogSegSize;`
`112`		`-`
`113`	`113`	`return true;`
`114`	`114`	`}`
`115`	`115`