From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 19 Jan 2005 18:26:38 +0000 (-0500)
Subject: Cleanup C code in debugfs's setfield.  Added missing return statement (turned
X-Git-Tag: E2FSPROGS-1_36~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=619a8ea70c7325cfff49f89e8b0fd4dfbce25d54;p=thirdparty%2Fe2fsprogs.git

Cleanup C code in debugfs's setfield.  Added missing return statement (turned
out it didn't cause a functional bug) and added #define _XOPEN_SOURCE on
non-Solaris systems to pick up strptime()'s definition.
---

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index 55ed0bb76..cc8235511 100644
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-19  Matthias Andree <matthias.andree@gmx.de>
+
+	* set_fields.c: Add _XOPEN_SOURCE #define on all but Solaris
+		systems so that strptime() gets defined.
+		(parse_bmap): Add missing return statement.
+
 2005-01-07  Theodore Ts'o  <tytso@mit.edu>
 
 	* debug_cmds.ct: Make the official name of set_inode be
diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
index da699a7d3..811edce50 100644
--- a/debugfs/set_fields.c
+++ b/debugfs/set_fields.c
@@ -9,6 +9,12 @@
  * %End-Header%
  */
 
+#ifndef __sun__
+       /* Solaris for some strange reason drops struct
+          timeval if _XOPEN_SOURCE defined */
+#define _XOPEN_SOURCE /* glibc2 needs this for strptime */
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -356,6 +362,7 @@ static errcode_t parse_bmap(struct field_set_info *info, char *arg)
 	if (retval) {
 		com_err("set_inode", retval, "while setting block map");
 	}
+	return retval;
 }