Fix -Wimplicit-int-conversion warning

24 files changed, 47 insertions, 49 deletions

diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index 8bf85a0..c3c66ab 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -592,12 +592,12 @@ fr_command_7z_get_mime_types (FrCommand *comm)
 	return sevenz_mime_types;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_7z_get_capabilities (FrCommand  *comm,
 				const char *mime_type,
 				gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (! is_program_available ("7za", check_command) && ! is_program_available ("7zr", check_command) && ! is_program_available ("7z", check_command))
diff --git a/src/fr-command-ace.c b/src/fr-command-ace.c
index 90bc152..f4e3b7f 100644
--- a/src/fr-command-ace.c
+++ b/src/fr-command-ace.c
@@ -238,12 +238,12 @@ fr_command_ace_get_mime_types (FrCommand *comm)
 	return ace_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_ace_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("unace", check_command))
diff --git a/src/fr-command-alz.c b/src/fr-command-alz.c
index f5a5dc1..f7dc577 100644
--- a/src/fr-command-alz.c
+++ b/src/fr-command-alz.c
@@ -294,12 +294,12 @@ fr_command_alz_get_mime_types (FrCommand *comm)
 	return alz_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_alz_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("unalz", check_command))
diff --git a/src/fr-command-ar.c b/src/fr-command-ar.c
index 83b29a9..3917ee8 100644
--- a/src/fr-command-ar.c
+++ b/src/fr-command-ar.c
@@ -214,12 +214,12 @@ fr_command_ar_get_mime_types (FrCommand *comm)
 	return ar_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_ar_get_capabilities (FrCommand  *comm,
 			        const char *mime_type,
 				gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("ar", check_command)) {
diff --git a/src/fr-command-arj.c b/src/fr-command-arj.c
index 49aaf29..0dfc0b6 100644
--- a/src/fr-command-arj.c
+++ b/src/fr-command-arj.c
@@ -315,12 +315,12 @@ fr_command_arj_get_mime_types (FrCommand *comm)
 	return arj_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_arj_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES | FR_COMMAND_CAN_ENCRYPT;
 	if (is_program_available ("arj", check_command))
diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c
index d2a2afa..647dbe3 100644
--- a/src/fr-command-cfile.c
+++ b/src/fr-command-cfile.c
@@ -544,12 +544,12 @@ fr_command_cfile_get_mime_types (FrCommand *comm)
 	return cfile_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_cfile_get_capabilities (FrCommand  *comm,
 				   const char *mime_type,
 				   gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_DO_NOTHING;
 	if (is_mime_type (mime_type, "application/x-gzip")) {
diff --git a/src/fr-command-cpio.c b/src/fr-command-cpio.c
index 7a74f51..c6a7198 100644
--- a/src/fr-command-cpio.c
+++ b/src/fr-command-cpio.c
@@ -227,12 +227,12 @@ fr_command_cpio_get_mime_types (FrCommand *comm)
 	return cpio_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_cpio_get_capabilities (FrCommand  *comm,
 			          const char *mime_type,
 				  gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available (CPIO_PATH, check_command))
diff --git a/src/fr-command-dpkg.c b/src/fr-command-dpkg.c
index c159b5f..d485bcd 100644
--- a/src/fr-command-dpkg.c
+++ b/src/fr-command-dpkg.c
@@ -216,12 +216,12 @@ fr_command_dpkg_get_mime_types (FrCommand *comm)
         return dpkg_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_dpkg_get_capabilities (FrCommand  *comm,
                                   const char *mime_type,
                                   gboolean    check_command)
 {
-        FrCommandCap capabilities;
+        FrCommandCaps capabilities;
 
         capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
         if (is_program_available ("dpkg-deb", check_command))
diff --git a/src/fr-command-iso.c b/src/fr-command-iso.c
index aa8706e..18ec0b9 100644
--- a/src/fr-command-iso.c
+++ b/src/fr-command-iso.c
@@ -203,12 +203,12 @@ fr_command_iso_get_mime_types (FrCommand *comm)
 	return iso_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_iso_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("isoinfo", check_command))
diff --git a/src/fr-command-jar.c b/src/fr-command-jar.c
index d5d1936..dbe09d1 100644
--- a/src/fr-command-jar.c
+++ b/src/fr-command-jar.c
@@ -150,12 +150,12 @@ fr_command_jar_get_mime_types (FrCommand *comm)
 	return jar_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_jar_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("zip", check_command))
diff --git a/src/fr-command-lha.c b/src/fr-command-lha.c
index 54d8354..22fd61d 100644
--- a/src/fr-command-lha.c
+++ b/src/fr-command-lha.c
@@ -320,12 +320,12 @@ fr_command_lha_get_mime_types (FrCommand *comm)
 	return lha_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_lha_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("lha", check_command))
diff --git a/src/fr-command-lrzip.c b/src/fr-command-lrzip.c
index a535b1e..ad41d4b 100644
--- a/src/fr-command-lrzip.c
+++ b/src/fr-command-lrzip.c
@@ -167,12 +167,12 @@ fr_command_lrzip_get_mime_types (FrCommand *comm)
 	return lrzip_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_lrzip_get_capabilities (FrCommand  *comm,
 				   const char *mime_type,
 				   gboolean    check_command)
 {
-	FrCommandCap capabilities = FR_COMMAND_CAN_DO_NOTHING;
+	FrCommandCaps capabilities = FR_COMMAND_CAN_DO_NOTHING;
 
 	if (is_program_available ("lrzip", check_command))
 		capabilities |= FR_COMMAND_CAN_READ_WRITE;
diff --git a/src/fr-command-nomarch.c b/src/fr-command-nomarch.c
index 67655e7..8a53dd5 100644
--- a/src/fr-command-nomarch.c
+++ b/src/fr-command-nomarch.c
@@ -204,12 +204,12 @@ fr_command_nomarch_get_mime_types (FrCommand *comm)
 	return nomarch_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_nomarch_get_capabilities (FrCommand  *comm,
                                      const char *mime_type,
                                      gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("nomarch", check_command)) {
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
index a90b03b..7794510 100644
--- a/src/fr-command-rar.c
+++ b/src/fr-command-rar.c
@@ -705,12 +705,12 @@ fr_command_rar_get_mime_types (FrCommand *comm)
 	return rar_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_rar_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER;
 	if (is_program_available ("rar", check_command))
diff --git a/src/fr-command-rpm.c b/src/fr-command-rpm.c
index 2d81fc1..90e5954 100644
--- a/src/fr-command-rpm.c
+++ b/src/fr-command-rpm.c
@@ -229,12 +229,12 @@ fr_command_rpm_get_mime_types (FrCommand *comm)
 	return rpm_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_rpm_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("rpm2cpio", check_command) &&
diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c
index a430645..4bfc32d 100644
--- a/src/fr-command-tar.c
+++ b/src/fr-command-tar.c
@@ -1003,12 +1003,12 @@ fr_command_tar_get_mime_types (FrCommand *comm)
 	return tar_mime_types;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_tar_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 
diff --git a/src/fr-command-unarchiver.c b/src/fr-command-unarchiver.c
index 7518fb5..c7aa5e6 100644
--- a/src/fr-command-unarchiver.c
+++ b/src/fr-command-unarchiver.c
@@ -255,12 +255,12 @@ fr_command_unarchiver_get_mime_types (FrCommand *comm)
 	return unarchiver_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_unarchiver_get_capabilities (FrCommand  *comm,
 					const char *mime_type,
 					gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_DO_NOTHING;
 	if (is_program_available ("lsar", check_command) && is_program_available ("unar", check_command))
diff --git a/src/fr-command-unstuff.c b/src/fr-command-unstuff.c
index 54ab129..cbccce6 100644
--- a/src/fr-command-unstuff.c
+++ b/src/fr-command-unstuff.c
@@ -277,12 +277,12 @@ fr_command_unstuff_get_mime_types (FrCommand *comm)
 	return unstuff_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_unstuff_get_capabilities (FrCommand  *comm,
 			             const char *mime_type,
 				     gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("unstuff", check_command))
diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
index 2d82c37..cd191bd 100644
--- a/src/fr-command-zip.c
+++ b/src/fr-command-zip.c
@@ -401,12 +401,12 @@ fr_command_zip_get_mime_types (FrCommand *comm)
 	return zip_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_zip_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES | FR_COMMAND_CAN_ENCRYPT;
 	if (is_program_available ("zip", check_command)) {
diff --git a/src/fr-command-zoo.c b/src/fr-command-zoo.c
index 79a102e..eea357f 100644
--- a/src/fr-command-zoo.c
+++ b/src/fr-command-zoo.c
@@ -318,12 +318,12 @@ fr_command_zoo_get_mime_types (FrCommand *comm)
 	return zoo_mime_type;
 }
 
-static FrCommandCap
+static FrCommandCaps
 fr_command_zoo_get_capabilities (FrCommand  *comm,
 			         const char *mime_type,
 				 gboolean    check_command)
 {
-	FrCommandCap capabilities;
+	FrCommandCaps capabilities;
 
 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
 	if (is_program_available ("zoo", check_command))
diff --git a/src/fr-command.c b/src/fr-command.c
index 255a229..d840acf 100644
--- a/src/fr-command.c
+++ b/src/fr-command.c
@@ -176,7 +176,7 @@ base_fr_command_get_mime_types (FrCommand *comm)
 	return void_mime_types;
 }
 
-static FrCommandCap
+static FrCommandCaps
 base_fr_command_get_capabilities (FrCommand  *comm,
 			          const char *mime_type,
 			          gboolean    check_command)
@@ -716,7 +716,7 @@ fr_command_update_capabilities (FrCommand *comm)
 	comm->capabilities = fr_command_get_capabilities (comm, comm->mime_type, TRUE);
 }
 
-FrCommandCap
+FrCommandCaps
 fr_command_get_capabilities (FrCommand  *comm,
 			     const char *mime_type,
 			     gboolean    check_command)
diff --git a/src/fr-command.h b/src/fr-command.h
index 2924a5d..751b1bb 100644
--- a/src/fr-command.h
+++ b/src/fr-command.h
@@ -146,7 +146,7 @@ struct _FrCommandClass
 	void          (*handle_error)     (FrCommand     *comm,
 				           FrProcError   *error);
 	const char ** (*get_mime_types)   (FrCommand     *comm);
-	FrCommandCap  (*get_capabilities) (FrCommand     *comm,
+	FrCommandCaps (*get_capabilities) (FrCommand     *comm,
 					   const char    *mime_type,
 					   gboolean       check_command);
 	void          (*set_mime_type)    (FrCommand     *comm,
@@ -198,7 +198,7 @@ gboolean       fr_command_is_capable_of       (FrCommand     *comm,
 					       FrCommandCaps  capabilities);
 const char **  fr_command_get_mime_types      (FrCommand     *comm);
 void           fr_command_update_capabilities (FrCommand     *comm);
-FrCommandCap   fr_command_get_capabilities    (FrCommand     *comm,
+FrCommandCaps  fr_command_get_capabilities    (FrCommand     *comm,
 					       const char    *mime_type,
 					       gboolean       check_command);
 void           fr_command_set_mime_type       (FrCommand     *comm,
diff --git a/src/java-utils.c b/src/java-utils.c
index be6a181..1ea7783 100644
--- a/src/java-utils.c
+++ b/src/java-utils.c
@@ -297,9 +297,9 @@ get_package_name_from_class_file (char *fname)
 
 	if (package != NULL) {
 		int j;
-		for (j = length; (j >= 0) && (end == 0); j--)
+		for (j = (int) length; (j >= 0) && (end == 0); j--)
 			if (package[j] == '/')
-				end = j;
+				end = (guint16) j;
 		char *package_padded = g_strndup (package, end);
 		g_free(package);
 		package = package_padded;
diff --git a/src/typedefs.h b/src/typedefs.h
index 82ce933..7bb8119 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -85,12 +85,10 @@ typedef enum { /*< skip >*/
 	FR_COMMAND_CAN_ENCRYPT = 1 << 3,
 	FR_COMMAND_CAN_ENCRYPT_HEADER = 1 << 4,
 	FR_COMMAND_CAN_CREATE_VOLUMES = 1 << 5
-} FrCommandCap;
+} FrCommandCaps;
 
 #define FR_COMMAND_CAN_READ_WRITE (FR_COMMAND_CAN_READ | FR_COMMAND_CAN_WRITE)
 
-typedef guint8 FrCommandCaps;
-
 typedef struct {
 	const char    *mime_type;
 	FrCommandCaps  current_capabilities;