[Ocfs2-tools-commits] manish commits r497 - trunk/fsck.ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-12-16 15:17:34 -0600 (Thu, 16 Dec 2004)
New Revision: 497

Modified:
   trunk/fsck.ocfs2/extent.c
   trunk/fsck.ocfs2/fsck.c
   trunk/fsck.ocfs2/journal.c
   trunk/fsck.ocfs2/pass3.c
   trunk/fsck.ocfs2/util.c
Log:
const correctness, make fsck.c compile


Modified: trunk/fsck.ocfs2/extent.c
===================================================================
--- trunk/fsck.ocfs2/extent.c	2004-12-16 18:45:36 UTC (rev 496)
+++ trunk/fsck.ocfs2/extent.c	2004-12-16 21:17:34 UTC (rev 497)
@@ -44,7 +44,7 @@
 #include "problem.h"
 #include "util.h"
 
-static char *whoami = "extent.c";
+static const char *whoami = "extent.c";
 
 struct extent_info {
 	uint64_t	ei_max_size;

Modified: trunk/fsck.ocfs2/fsck.c
===================================================================
--- trunk/fsck.ocfs2/fsck.c	2004-12-16 18:45:36 UTC (rev 496)
+++ trunk/fsck.ocfs2/fsck.c	2004-12-16 21:17:34 UTC (rev 497)
@@ -102,7 +102,7 @@
 extern int opterr, optind;
 extern char *optarg;
 
-static errcode_t o2fsck_state_init(ocfs2_filesys *fs, char *whoami, 
+static errcode_t o2fsck_state_init(ocfs2_filesys *fs, const char *whoami, 
 				    o2fsck_state *ost)
 {
 	errcode_t ret;
@@ -163,7 +163,7 @@
 	ocfs2_dinode *di = ost->ost_fs->fs_super;
 	ocfs2_super_block *sb = OCFS2_RAW_SB(di);
 	errcode_t ret = 0;
-	char *whoami = __FUNCTION__;
+	const char *whoami = __FUNCTION__;
 
 	if (sb->s_max_nodes == 0) {
 		printf("The superblock max_nodes field is set to 0.\n");
@@ -348,7 +348,7 @@
 				uint64_t blksize)
 {
 	errcode_t ret;
-	char *whoami = __FUNCTION__;
+	const char *whoami = __FUNCTION__;
 
 	ret = ocfs2_open(filename, open_flags, blkno, blksize, &ost->ost_fs);
 	if (ret) {
@@ -370,7 +370,7 @@
 {	
 	int replayed = 0, should = 0;
 	errcode_t ret = 0;
-	char *whoami = __FUNCTION__;
+	const char *whoami = __FUNCTION__;
 
 	ret = o2fsck_should_replay_journals(ost->ost_fs, &should);
 	if (ret)
@@ -509,7 +509,7 @@
 				print_usage();
 				goto out;
 				break;
-		
+		}
 	}
 
 

Modified: trunk/fsck.ocfs2/journal.c
===================================================================
--- trunk/fsck.ocfs2/journal.c	2004-12-16 18:45:36 UTC (rev 496)
+++ trunk/fsck.ocfs2/journal.c	2004-12-16 21:17:34 UTC (rev 497)
@@ -47,7 +47,7 @@
 #include "problem.h"
 #include "util.h"
 
-static char *whoami = "journal recovery";
+static const char *whoami = "journal recovery";
 
 struct journal_info {
 	int			ji_node;

Modified: trunk/fsck.ocfs2/pass3.c
===================================================================
--- trunk/fsck.ocfs2/pass3.c	2004-12-16 18:45:36 UTC (rev 496)
+++ trunk/fsck.ocfs2/pass3.c	2004-12-16 21:17:34 UTC (rev 497)
@@ -41,7 +41,7 @@
 #include "problem.h"
 #include "util.h"
 
-static char *whoami = "pass3";
+static const char *whoami = "pass3";
 
 static void check_root(o2fsck_state *ost)
 {

Modified: trunk/fsck.ocfs2/util.c
===================================================================
--- trunk/fsck.ocfs2/util.c	2004-12-16 18:45:36 UTC (rev 496)
+++ trunk/fsck.ocfs2/util.c	2004-12-16 21:17:34 UTC (rev 497)
@@ -34,7 +34,7 @@
 void o2fsck_write_inode(o2fsck_state *ost, uint64_t blkno, ocfs2_dinode *di)
 {
 	errcode_t ret;
-	char *whoami = "o2fsck_write_inode";
+	const char *whoami = __FUNCTION__;
 
 	if (blkno != di->i_blkno) {
 		com_err(whoami, OCFS2_ET_INTERNAL_FAILURE, "when asked to "
@@ -75,7 +75,7 @@
 	char *buf = NULL;
 	errcode_t ret;
 	ocfs2_dinode *dinode;
-	char *whoami = __FUNCTION__;
+	const char *whoami = __FUNCTION__;
 
 	*type = 0;