Use size_t for memory allocation size where applicable.

config_env.c

@@ -58,7 +58,7 @@ char *proxy_config_env_get_proxy(const char *scheme) {
         return NULL;
 
     // Construct name of environment variable based on proxy scheme
-    int32_t name_len = strlen(scheme) + 8;
+    size_t name_len = strlen(scheme) + 8;
     char *name = (char *)malloc(name_len);
     snprintf(name, name_len, "%s_proxy", scheme);
 

config_gnome2.c

@@ -83,7 +83,7 @@ char *proxy_config_gnome2_get_proxy(const char *scheme) {
     host = g_proxy_config_gnome2.gconf_engine_get_string(g_proxy_config_gnome2.gconf_default, host_key, NULL);
     if (host && *host) {
         // Allocate space for host:port
-        int32_t max_proxy = strlen(host) + 32;
+        size_t max_proxy = strlen(host) + 32;
         proxy = (char *)malloc(max_proxy);
         if (proxy) {
             port = g_proxy_config_gnome2.gconf_engine_get_int(g_proxy_config_gnome2.gconf_default, port_key, NULL);
@@ -100,7 +100,7 @@ char *proxy_config_gnome2_get_proxy(const char *scheme) {
 
 typedef struct g_slist_for_each_bypass_s {
     char *value;
-    int32_t max_value;
+    size_t max_value;
 } g_slist_for_each_bypass_s;
 
 static void gs_list_for_each_func(gpointer data, gpointer user_data) {
@@ -116,7 +116,7 @@ static void gs_list_for_each_func(gpointer data, gpointer user_data) {
         bypass->max_value += strlen(rule) + 2;
     } else {
         // Append the rule to the string
-        int32_t bypass_len = strlen(bypass->value);
+        size_t bypass_len = strlen(bypass->value);
         snprintf(bypass->value + bypass_len, bypass->max_value - bypass_len, "%s,", rule);
     }
 }

config_gnome3.c

@@ -94,7 +94,7 @@ char *proxy_config_gnome3_get_proxy(const char *scheme) {
     char *host = g_proxy_config_gnome3.g_settings_get_string(settings, "host");
     if (host && *host) {
         // Allocate space for host:port
-        int32_t max_proxy = strlen(host) + 32;
+        size_t max_proxy = strlen(host) + 32;
         proxy = (char *)malloc(max_proxy);
         if (proxy) {
             uint32_t port = g_proxy_config_gnome3.g_settings_get_int(settings, "port");
@@ -119,7 +119,7 @@ char *proxy_config_gnome3_get_bypass_list(void) {
 
     char **hosts = g_proxy_config_gnome3.g_settings_get_strv(settings, "ignore-hosts");
     if (hosts) {
-        int32_t max_value = 0;
+        size_t max_value = 0;
 
         // Enumerate the list to get the size of the bypass list
         for (int32_t i = 0; hosts[i] && *(hosts[i]); i++)
@@ -131,7 +131,7 @@ char *proxy_config_gnome3_get_bypass_list(void) {
             if (bypass_list) {
                 // Enumerate hosts and copy them to the bypass list
                 for (int32_t i = 0; hosts[i]; i++) {
-                    int32_t bypass_list_len = strlen(bypass_list);
+                    size_t bypass_list_len = strlen(bypass_list);
                     snprintf(bypass_list + bypass_list_len, max_value - bypass_list_len, "%s,", hosts[i]);
                 }
 

config_kde.c

@@ -49,16 +49,16 @@ char *proxy_config_kde_get_proxy(const char *scheme) {
         return NULL;
 
     // Construct key name to search for in config
-    int32_t scheme_len = strlen(scheme);
-    int32_t max_key = scheme_len + 8;
+    size_t scheme_len = strlen(scheme);
+    size_t max_key = scheme_len + 8;
     char *key = (char *)calloc(max_key, sizeof(char));
     if (!key)
         return NULL;
 
     // Check if scheme is actually a url
     char *host = strchr(scheme, ':');
     if (host) {
-        scheme_len = (int32_t)(host - scheme);
+        scheme_len = (host - scheme);
         strncat(key, scheme, scheme_len);
     } else {
         strncat(key, scheme, max_key - 1);

config_mac.c

@@ -62,7 +62,7 @@ char *proxy_config_mac_get_auto_config_url(void) {
 
 char *proxy_config_mac_get_proxy(const char *scheme) {
     char *proxy = NULL;
-    int32_t max_proxy = 0;
+    size_t max_proxy = 0;
 
     // Determine the indexes to retrieve from the system proxy settings to get the value
     // for the proxy list we want
@@ -127,8 +127,8 @@ char *proxy_config_mac_get_bypass_list(void) {
     char *bypass_list = NULL;
     int32_t bypass_list_len = 0;
     int32_t bypass_list_count = 0;
-    int32_t max_bypass_list = 0;
     int32_t exception_count = 0;
+    size_t max_bypass_list = 0;
 
     CFDictionaryRef proxy_settings = CFNetworkCopySystemProxySettings();
     if (!proxy_settings)

execute_jscore.c

@@ -66,7 +66,7 @@ typedef struct proxy_execute_jscore_s {
 } proxy_execute_jscore_s;
 
 static char *js_string_dup_to_utf8(JSStringRef str) {
-    int32_t utf8_string_size = 0;
+    size_t utf8_string_size = 0;
     char *utf8_string = NULL;
 
     if (!str)

resolver_gnome3.c

@@ -29,7 +29,7 @@ typedef struct g_proxy_resolver_gnome3_s {
     // Glib module handle
     void *glib_module;
     // Glib functions
-    gint (*g_strv_length)(gchar **str_array);
+    guint (*g_strv_length)(gchar **str_array);
     void (*g_strfreev)(gchar **str_array);
     void (*g_error_free)(GError *error);
 } g_proxy_resolver_gnome3_s;
@@ -84,8 +84,8 @@ static bool proxy_resolver_gnome3_create_resolver(proxy_resolver_gnome3_s *proxy
 }
 
 static bool proxy_resolver_gnome3_get_proxies(proxy_resolver_gnome3_s *proxy_resolver, char **proxies, GError *error) {
-    int32_t proxy_count = g_proxy_resolver_gnome3.g_strv_length(proxies);
-    int32_t max_list = (proxy_count + 1) * MAX_PROXY_URL;
+    guint proxy_count = g_proxy_resolver_gnome3.g_strv_length(proxies);
+    size_t max_list = (proxy_count + 1) * MAX_PROXY_URL;
     int32_t list_len = 0;
 
     if (!proxies) {

util.c

@@ -193,7 +193,7 @@ char *get_url_host(const char *url) {
         host_end = (char *)host_start + strlen(host_start);
 
     // Allocate a copy the host
-    int32_t host_len = (int32_t)(host_end - host_start) + 1;
+    size_t host_len = (host_end - host_start) + 1;
     char *host = (char *)calloc(host_len, sizeof(char));
     if (!host)
         return strdup(url);