changeset 4195:a00c5d4915f3 HEAD

Clear mountpoint struct even in error cases.
author Timo Sirainen <tss@iki.fi>
date Fri, 14 Apr 2006 14:28:21 +0300
parents de4609242c8a
children 6ac0d63b297f
files src/lib/mountpoint.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/mountpoint.c	Fri Apr 14 14:26:37 2006 +0300
+++ b/src/lib/mountpoint.c	Fri Apr 14 14:28:21 2006 +0300
@@ -35,6 +35,7 @@
 int mountpoint_get(const char *path, pool_t pool, struct mountpoint *point_r)
 {
 #ifdef MOUNTPOINT_UNKNOWN
+	memset(point_r, 0, sizeof(*point_r));
 	errno = ENOSYS;
 	return -1;
 #elif defined (HAVE_STATFS_MNTFROMNAME)
@@ -64,6 +65,7 @@
 	unsigned int block_size;
 	FILE *f;
 
+	memset(point_r, 0, sizeof(*point_r));
 	if (stat(path, &st) < 0) {
 		i_error("stat(%s) failed: %m", path);
 		return -1;
@@ -116,12 +118,10 @@
 	if (device_path == NULL)
 		return 0;
 
-	memset(point_r, 0, sizeof(*point_r));
 	point_r->device_path = p_strdup(pool, device_path);
 	point_r->mount_path = p_strdup(pool, mount_path);
 	point_r->type = p_strdup(pool, type);
 	point_r->block_size = block_size;
-
 	return 1;
 #endif
 }