- avoid some integer conversions

aschnell · aschnell · commit eb02b260664c · 2014-06-04T11:55:44.000+02:00
diff --git a/dbus/DBusConnection.cc b/dbus/DBusConnection.cc
@@ -150,7 +150,7 @@ namespace DBus
     }
 
 
-    unsigned long
+    uid_t
     Connection::get_unix_userid(const Message& m)
     {
 	boost::lock_guard<boost::mutex> lock(mutex);
diff --git a/dbus/DBusConnection.h b/dbus/DBusConnection.h
@@ -54,7 +54,7 @@ namespace DBus
 	void add_match(const string& rule) { add_match(rule.c_str()); }
 	void remove_match(const string& rule) { remove_match(rule.c_str()); }
 
-	unsigned long get_unix_userid(const Message& m);
+	uid_t get_unix_userid(const Message& m);
 
     protected:
 
diff --git a/examples/c/snapper_dbus_cli.c b/examples/c/snapper_dbus_cli.c
@@ -321,21 +321,21 @@ static int snap_struct_unpack(DBusMessageIter *iter,
 	return ret;
 }
 
-static void snap_array_free(int32_t num_snaps,
+static void snap_array_free(uint32_t num_snaps,
 			    struct snap *snaps)
 {
-	int i;
+	uint32_t i;
 
 	for (i = 0; i < num_snaps; i++) {
 		free(snaps[i].user_data);
 	}
 	free(snaps);
 }
 
-static void snap_array_print(int32_t num_snaps,
+static void snap_array_print(uint32_t num_snaps,
 			     struct snap *snaps)
 {
-	int i;
+	uint32_t i;
 
 	for (i = 0; i < num_snaps; i++) {
 		printf("id: %u\n"
@@ -543,21 +543,21 @@ static int conf_struct_unpack(DBusMessageIter *iter,
 	return ret;
 }
 
-static void conf_array_free(int32_t num_confs,
+static void conf_array_free(uint32_t num_confs,
 			    struct config *confs)
 {
-	int i;
+	uint32_t i;
 
 	for (i = 0; i < num_confs; i++) {
 		free(confs[i].attrs);
 	}
 	free(confs);
 }
 
-static void conf_array_print(int32_t num_confs,
+static void conf_array_print(uint32_t num_confs,
 			     struct config *confs)
 {
-	int i;
+	uint32_t i;
 
 	for (i = 0; i < num_confs; i++) {
 		printf("name: %s\n"
diff --git a/pam/pam_snapper.c b/pam/pam_snapper.c
@@ -425,8 +425,8 @@ static int forker( pam_handle_t * pamh, const char *pam_user, uid_t uid, gid_t g
 	}
 }
 
-static void fill_user_data( pam_handle_t * pamh, struct dict ( *user_data )[], int *num_user_data,
-			    int max_user_data )
+static void fill_user_data( pam_handle_t * pamh, struct dict ( *user_data )[],
+			    uint32_t * num_user_data, uint32_t max_user_data )
 {
 	int fields[4] = { PAM_RUSER, PAM_RHOST, PAM_TTY, PAM_SERVICE };
 	const char *names[4] = { "ruser", "rhost", "tty", "service" };
@@ -472,9 +472,9 @@ static int get_ugid( pam_handle_t * pamh, const char *pam_user, uid_t * uid, gid
 static int worker( pam_handle_t * pamh, const char *pam_user, const char *snapper_conf,
 		   createmode_t createmode, const char *cleanup )
 {
-	const int max_user_data = 5;
+	const uint32_t max_user_data = 5;
 	struct dict user_data[max_user_data];
-	int num_user_data = 0;
+	uint32_t num_user_data = 0;
 	fill_user_data( pamh, &user_data, &num_user_data, max_user_data );
 
 	uid_t uid;
@@ -500,8 +500,7 @@ static int worker( pam_handle_t * pamh, const char *pam_user, const char *snappe
 	}
 
 	if ( forker( pamh, pam_user, uid, gid, snapper_conf, createmode, cleanup, num_user_data,
-		     user_data, snapshot_num_in, snapshot_num_out ) != 0 )
-	{
+		     user_data, snapshot_num_in, snapshot_num_out ) != 0 ) {
 		free( snapshot_num_out );
 		return -1;
 	}
diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
@@ -106,11 +106,11 @@ namespace snapper
     }
 
 
-    int
+    ssize_t
     readlink(const string& path, string& buf)
     {
 	char tmp[1024];
-	int ret = ::readlink(path.c_str(), tmp, sizeof(tmp));
+	ssize_t ret = ::readlink(path.c_str(), tmp, sizeof(tmp));
 	if (ret >= 0)
 	    buf = string(tmp, ret);
 	return ret;
diff --git a/snapper/AppUtil.h b/snapper/AppUtil.h
@@ -51,7 +51,7 @@ namespace snapper
     bool clonefile(int src_fd, int dest_fd);
     bool copyfile(int src_fd, int dest_fd);
 
-    int readlink(const string& path, string& buf);
+    ssize_t readlink(const string& path, string& buf);
     int symlink(const string& oldpath, const string& newpath);
 
     string realpath(const string& path);
diff --git a/snapper/Compare.cc b/snapper/Compare.cc
@@ -94,15 +94,15 @@ namespace snapper
 	{
 	    off_t t = min(block_size, length);
 
-	    int r1 = read(fd1, block1, t);
+	    ssize_t r1 = read(fd1, block1, t);
 	    if (r1 != t)
 	    {
 		y2err("read failed path:" << file1.fullname() << " errno:" << errno);
 		equal = false;
 		break;
 	    }
 
-	    int r2 = read(fd2, block2, t);
+	    ssize_t r2 = read(fd2, block2, t);
 	    if (r2 != t)
 	    {
 		y2err("read failed path:" << file2.fullname() << " errno:" << errno);
diff --git a/snapper/FileUtils.cc b/snapper/FileUtils.cc
@@ -287,14 +287,14 @@ namespace snapper
     }
 
 
-    int
+    ssize_t
     SDir::readlink(const string& name, string& buf) const
     {
 	assert(name.find('/') == string::npos);
 	assert(name != "..");
 
 	char tmp[1024];
-	int ret = ::readlinkat(dirfd, name.c_str(), tmp, sizeof(tmp));
+	ssize_t ret = ::readlinkat(dirfd, name.c_str(), tmp, sizeof(tmp));
 	if (ret >= 0)
 	    buf = string(tmp, ret);
 	return ret;
@@ -600,7 +600,7 @@ namespace snapper
     }
 
 
-    int
+    ssize_t
     SFile::readlink(string& buf) const
     {
 	return dir.readlink(name, buf);
diff --git a/snapper/FileUtils.h b/snapper/FileUtils.h
@@ -82,7 +82,7 @@ namespace snapper
 	int stat(const string& name, struct stat* buf, int flags) const;
 	int open(const string& name, int flags) const;
 	int open(const string& name, int flags, mode_t mode) const;
-	int readlink(const string& name, string& buf) const;
+	ssize_t readlink(const string& name, string& buf) const;
 	int mkdir(const string& name, mode_t mode) const;
 	int unlink(const string& name, int flags) const;
 	int chmod(const string& name, mode_t mode, int flags) const;
@@ -126,7 +126,7 @@ namespace snapper
 
 	int stat(struct stat* buf, int flags) const;
 	int open(int flags) const;
-	int readlink(string& buf) const;
+	ssize_t readlink(string& buf) const;
 	int chmod(mode_t mode, int flags) const;
 
 	bool xaSupported() const;

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ namespace DBus`
`150`	`150`	`}`
`151`	`151`
`152`	`152`
`153`		`- unsigned long`
	`153`	`+ uid_t`
`154`	`154`	`Connection::get_unix_userid(const Message& m)`
`155`	`155`	`{`
`156`	`156`	`boost::lock_guard<boost::mutex> lock(mutex);`
Original file line number	Diff line number	Diff line change
`@@ -321,21 +321,21 @@ static int snap_struct_unpack(DBusMessageIter *iter,`
`321`	`321`	`return ret;`
`322`	`322`	`}`
`323`	`323`
`324`		`-static void snap_array_free(int32_t num_snaps,`
	`324`	`+static void snap_array_free(uint32_t num_snaps,`
`325`	`325`	`struct snap *snaps)`
`326`	`326`	`{`
`327`		`- int i;`
	`327`	`+ uint32_t i;`
`328`	`328`
`329`	`329`	`for (i = 0; i < num_snaps; i++) {`
`330`	`330`	`free(snaps[i].user_data);`
`331`	`331`	`}`
`332`	`332`	`free(snaps);`
`333`	`333`	`}`
`334`	`334`
`335`		`-static void snap_array_print(int32_t num_snaps,`
	`335`	`+static void snap_array_print(uint32_t num_snaps,`
`336`	`336`	`struct snap *snaps)`
`337`	`337`	`{`
`338`		`- int i;`
	`338`	`+ uint32_t i;`
`339`	`339`
`340`	`340`	`for (i = 0; i < num_snaps; i++) {`
`341`	`341`	`printf("id: %u\n"`
`@@ -543,21 +543,21 @@ static int conf_struct_unpack(DBusMessageIter *iter,`
`543`	`543`	`return ret;`
`544`	`544`	`}`
`545`	`545`
`546`		`-static void conf_array_free(int32_t num_confs,`
	`546`	`+static void conf_array_free(uint32_t num_confs,`
`547`	`547`	`struct config *confs)`
`548`	`548`	`{`
`549`		`- int i;`
	`549`	`+ uint32_t i;`
`550`	`550`
`551`	`551`	`for (i = 0; i < num_confs; i++) {`
`552`	`552`	`free(confs[i].attrs);`
`553`	`553`	`}`
`554`	`554`	`free(confs);`
`555`	`555`	`}`
`556`	`556`
`557`		`-static void conf_array_print(int32_t num_confs,`
	`557`	`+static void conf_array_print(uint32_t num_confs,`
`558`	`558`	`struct config *confs)`
`559`	`559`	`{`
`560`		`- int i;`
	`560`	`+ uint32_t i;`
`561`	`561`
`562`	`562`	`for (i = 0; i < num_confs; i++) {`
`563`	`563`	`printf("name: %s\n"`
Original file line number	Diff line number	Diff line change
`@@ -425,8 +425,8 @@ static int forker( pam_handle_t * pamh, const char *pam_user, uid_t uid, gid_t g`
`425`	`425`	`}`
`426`	`426`	`}`
`427`	`427`
`428`		`-static void fill_user_data( pam_handle_t * pamh, struct dict ( user_data )[], int num_user_data,`
`429`		`- int max_user_data )`
	`428`	`+static void fill_user_data( pam_handle_t * pamh, struct dict ( *user_data )[],`
	`429`	`+ uint32_t * num_user_data, uint32_t max_user_data )`
`430`	`430`	`{`
`431`	`431`	`int fields[4] = { PAM_RUSER, PAM_RHOST, PAM_TTY, PAM_SERVICE };`
`432`	`432`	`const char *names[4] = { "ruser", "rhost", "tty", "service" };`
`@@ -472,9 +472,9 @@ static int get_ugid( pam_handle_t * pamh, const char pam_user, uid_t uid, gid`
`472`	`472`	`static int worker( pam_handle_t * pamh, const char pam_user, const char snapper_conf,`
`473`	`473`	`createmode_t createmode, const char *cleanup )`
`474`	`474`	`{`
`475`		`- const int max_user_data = 5;`
	`475`	`+ const uint32_t max_user_data = 5;`
`476`	`476`	`struct dict user_data[max_user_data];`
`477`		`- int num_user_data = 0;`
	`477`	`+ uint32_t num_user_data = 0;`
`478`	`478`	`fill_user_data( pamh, &user_data, &num_user_data, max_user_data );`
`479`	`479`
`480`	`480`	`uid_t uid;`
`@@ -500,8 +500,7 @@ static int worker( pam_handle_t * pamh, const char pam_user, const char snappe`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`if ( forker( pamh, pam_user, uid, gid, snapper_conf, createmode, cleanup, num_user_data,`
`503`		`- user_data, snapshot_num_in, snapshot_num_out ) != 0 )`
`504`		`- {`
	`503`	`+ user_data, snapshot_num_in, snapshot_num_out ) != 0 ) {`
`505`	`504`	`free( snapshot_num_out );`
`506`	`505`	`return -1;`
`507`	`506`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,11 @@ namespace snapper`
`106`	`106`	`}`
`107`	`107`
`108`	`108`
`109`		`- int`
	`109`	`+ ssize_t`
`110`	`110`	`readlink(const string& path, string& buf)`
`111`	`111`	`{`
`112`	`112`	`char tmp[1024];`
`113`		`- int ret = ::readlink(path.c_str(), tmp, sizeof(tmp));`
	`113`	`+ ssize_t ret = ::readlink(path.c_str(), tmp, sizeof(tmp));`
`114`	`114`	`if (ret >= 0)`
`115`	`115`	`buf = string(tmp, ret);`
`116`	`116`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -94,15 +94,15 @@ namespace snapper`
`94`	`94`	`{`
`95`	`95`	`off_t t = min(block_size, length);`
`96`	`96`
`97`		`- int r1 = read(fd1, block1, t);`
	`97`	`+ ssize_t r1 = read(fd1, block1, t);`
`98`	`98`	`if (r1 != t)`
`99`	`99`	`{`
`100`	`100`	`y2err("read failed path:" << file1.fullname() << " errno:" << errno);`
`101`	`101`	`equal = false;`
`102`	`102`	`break;`
`103`	`103`	`}`
`104`	`104`
`105`		`- int r2 = read(fd2, block2, t);`
	`105`	`+ ssize_t r2 = read(fd2, block2, t);`
`106`	`106`	`if (r2 != t)`
`107`	`107`	`{`
`108`	`108`	`y2err("read failed path:" << file2.fullname() << " errno:" << errno);`
Original file line number	Diff line number	Diff line change
`@@ -287,14 +287,14 @@ namespace snapper`
`287`	`287`	`}`
`288`	`288`
`289`	`289`
`290`		`- int`
	`290`	`+ ssize_t`
`291`	`291`	`SDir::readlink(const string& name, string& buf) const`
`292`	`292`	`{`
`293`	`293`	`assert(name.find('/') == string::npos);`
`294`	`294`	`assert(name != "..");`
`295`	`295`
`296`	`296`	`char tmp[1024];`
`297`		`- int ret = ::readlinkat(dirfd, name.c_str(), tmp, sizeof(tmp));`
	`297`	`+ ssize_t ret = ::readlinkat(dirfd, name.c_str(), tmp, sizeof(tmp));`
`298`	`298`	`if (ret >= 0)`
`299`	`299`	`buf = string(tmp, ret);`
`300`	`300`	`return ret;`
`@@ -600,7 +600,7 @@ namespace snapper`
`600`	`600`	`}`
`601`	`601`
`602`	`602`
`603`		`- int`
	`603`	`+ ssize_t`
`604`	`604`	`SFile::readlink(string& buf) const`
`605`	`605`	`{`
`606`	`606`	`return dir.readlink(name, buf);`