X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futils-jbus.c;fp=src%2Futils-jbus.c;h=9d6c1d5dbad9b0d4bfa187b6d98ac00ab16cb149;hb=2c6fcae14552ab6e7addc82516617a135f86b5ca;hp=6d01b1e39320e313b098cf27e8cfc6b24b69679a;hpb=abfae2b6d73d7be40ffbff8e8429f71d82df90b5;p=src%2Fapp-framework-main.git

diff --git a/src/utils-jbus.c b/src/utils-jbus.c
index 6d01b1e..9d6c1d5 100644
--- a/src/utils-jbus.c
+++ b/src/utils-jbus.c
@@ -86,7 +86,7 @@ struct jbus {
 	char *name;
 	int watchnr;
 	int watchfd;
-	int watchflags;
+	short watchflags;
 };
 
 /*********************** STATIC COMMON METHODS *****************/
@@ -407,12 +407,11 @@ static DBusHandlerResult incoming(DBusConnection *connection, DBusMessage *messa
 static void watchset(DBusWatch *watch, struct jbus *jbus)
 {
 	unsigned int flags;
-	int wf, e;
+	short wf;
 
 	flags = dbus_watch_get_flags(watch);
-	e = dbus_watch_get_enabled(watch);
 	wf = jbus->watchflags;
-	if (e) {
+	if (dbus_watch_get_enabled(watch)) {
 		if (flags & DBUS_WATCH_READABLE)
 			wf |= POLLIN;
 		if (flags & DBUS_WATCH_WRITABLE)
@@ -721,7 +720,7 @@ int jbus_read_write_dispatch_multiple(struct jbus **jbuses, int njbuses, int tom
 		errno = EINVAL;
 		return -1;
 	}
-	fds = alloca(njbuses * sizeof * fds);
+	fds = alloca((unsigned)njbuses * sizeof * fds);
 	assert(fds != NULL);
 
 	r = jbus_dispatch_multiple(jbuses, njbuses, maxcount);
@@ -729,7 +728,7 @@ int jbus_read_write_dispatch_multiple(struct jbus **jbuses, int njbuses, int tom
 		return r;
 	n = jbus_fill_pollfds(jbuses, njbuses, fds);
 	for(;;) {
-		s = poll(fds, n, toms);
+		s = poll(fds, (nfds_t)n, toms);
 		if (s >= 0)
 			break;
 		if (errno != EINTR)