dmraid/lib/metadata metadata.c

dmraid/lib/metadata metadata.c

[heinzm]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	heinzm@sourceware.org	2009-11-04 13:06:36

Modified files:
	lib/metadata   : metadata.c 

Log message:
	Return error when no block devices or no RAID disks found

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/lib/metadata/metadata.c.diff?cvsroot=dm&r1=1.7&r2=1.8

--- dmraid/lib/metadata/metadata.c	2009/09/16 11:45:16	1.7
+++ dmraid/lib/metadata/metadata.c	2009/11/04 13:06:36	1.8
@@ -2096,7 +2096,7 @@
 
 	if (!count_devices(lc, DEVICE)) {
 		log_print(lc, "no block devices found");
-		return 1;
+		return 0;
 	}
 
 	if (!(M_RAID & p->metadata))
@@ -2118,7 +2118,7 @@
 	if (!OPT_HOT_SPARE_SET(lc) && !OPT_CREATE(lc)
 	    && !count_devices(lc, RAID)) {
 		format_error(lc, "disks", argv);
-		return 1;
+		return 0;
 	}
 
 	if (M_SET & p->metadata) {

dmraid/lib/metadata metadata.c

[zkabelac]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	zkabelac@sourceware.org	2010-07-13 20:13:13

Modified files:
	lib/metadata   : metadata.c 

Log message:
	Use static for localy some used functions.
	Use const char *dp  for find_disk()

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/lib/metadata/metadata.c.diff?cvsroot=dm&r1=1.12&r2=1.13

--- dmraid/lib/metadata/metadata.c	2010/03/19 13:56:49	1.12
+++ dmraid/lib/metadata/metadata.c	2010/07/13 20:13:13	1.13
@@ -761,7 +761,7 @@
 }
 
 /* Discover RAID devices that are spares */
-void
+static void
 discover_raid_devices_spares(struct lib_context *lc, const char *format)
 {
 	struct dev_info *di;
@@ -1146,7 +1146,7 @@
 }
 
 /* Parse RAID set creation arguments. */
-int
+static int
 parse_rs_args(struct lib_context *lc, char **argv, struct raid_set_descr *rsd)
 {
 	int o, n, opt_idx;
@@ -1215,7 +1215,7 @@
 }
 
 struct dev_info *
-find_disk(struct lib_context *lc, char *dp)
+find_disk(struct lib_context *lc, const char *dp)
 {
 	struct dev_info *di;
 
@@ -1337,7 +1337,7 @@
 		_free_raid_set(lc, rs);
 }
 
-struct raid_dev *
+static struct raid_dev *
 find_raiddev(struct lib_context *lc, struct raid_set *rs, struct dev_info *di)
 {
 	struct raid_dev *rd;
@@ -1353,7 +1353,7 @@
 	return NULL;
 }
 
-struct raid_set *
+static struct raid_set *
 create_raidset(struct lib_context *lc, struct raid_set_descr *rsd)
 {
 	struct raid_set *rs, *rs_sub, *rs_tmp;
@@ -1459,7 +1459,7 @@
 	return NULL;
 }
 
-int
+static int
 rebuild_config_raidset(struct lib_context *lc, struct raid_set *rs)
 {
 
@@ -2056,7 +2056,7 @@
 }
 
 
-void
+static void
 format_error(struct lib_context *lc, const char *error, char **argv)
 {
 	log_print_nnl(lc, "no raid %s", error);