[Ocfs2-tools-commits] manish commits r780 - trunk/tunefs.ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-04-02 16:20:25 -0600 (Sat, 02 Apr 2005)
New Revision: 780

Modified:
   trunk/tunefs.ocfs2/Makefile
   trunk/tunefs.ocfs2/tunefs.c
Log:
Remove glib dependency


Modified: trunk/tunefs.ocfs2/Makefile
===================================================================
--- trunk/tunefs.ocfs2/Makefile	2005-04-02 08:52:49 UTC (rev 779)
+++ trunk/tunefs.ocfs2/Makefile	2005-04-02 22:20:25 UTC (rev 780)
@@ -24,7 +24,7 @@
 
 SBIN_PROGRAMS = tunefs.ocfs2
 
-INCLUDES = -I$(TOPDIR)/libocfs2/include $(GLIB_CFLAGS) -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include 
 DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
 
 MANS = tunefs.ocfs2.8
@@ -35,6 +35,6 @@
 DIST_FILES = $(CFILES) tunefs.ocfs2.8.in
 
 tunefs.ocfs2: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
-	$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(GLIB_LIBS) $(COM_ERR_LIBS)
+	$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
 
 include $(TOPDIR)/Postamble.make

Modified: trunk/tunefs.ocfs2/tunefs.c
===================================================================
--- trunk/tunefs.ocfs2/tunefs.c	2005-04-02 08:52:49 UTC (rev 779)
+++ trunk/tunefs.ocfs2/tunefs.c	2005-04-02 22:20:25 UTC (rev 780)
@@ -43,7 +43,6 @@
 #include <netinet/in.h>
 #include <inttypes.h>
 #include <ctype.h>
-#include <glib.h>
 
 #include <ocfs2.h>
 #include <ocfs2_fs.h>
@@ -331,7 +330,7 @@
 	for (i = OCFS2_LAST_GLOBAL_SYSTEM_INODE + 1; i < NUM_SYSTEM_INODES; ++i) {
 		for (j = old_num; j < opts.num_nodes; ++j) {
 			sprintf(fname, ocfs2_system_inodes[i].si_name, j);
-			display_str = g_strdup_printf("Adding %s...", fname);
+			asprintf(&display_str, "Adding %s...", fname);
 			printf("%s", display_str);
 			fflush(stdout);
 
@@ -342,7 +341,7 @@
 				goto next_file;
 
 			/* create inode for system file */
-			ret =  ocfs2_new_system_inode(fs, &blkno,
+			ret = ocfs2_new_system_inode(fs, &blkno,
 						      ocfs2_system_inodes[i].si_mode,
 						      ocfs2_system_inodes[i].si_iflags);
 			if (ret)