janitorial: use char and int over gchar and gint

4 files changed, 28 insertions, 32 deletions

diff --git a/loaders/lua5.1/peas-lua-internal.c b/loaders/lua5.1/peas-lua-internal.c
index 5530015..a72a4b0 100644
--- a/loaders/lua5.1/peas-lua-internal.c
+++ b/loaders/lua5.1/peas-lua-internal.c
@@ -37,7 +37,7 @@ static gpointer failed_err_key = NULL;
 static int
 failed_fn (lua_State *L)
 {
-  gchar *msg;
+  char *msg;
 
   /* The first parameter is the Hooks table instance */
   luaL_checktype (L, 1, LUA_TTABLE);
@@ -96,10 +96,10 @@ peas_lua_internal_shutdown (lua_State *L)
 }
 
 gboolean
-peas_lua_internal_call (lua_State   *L,
-                        const gchar *name,
-                        guint        n_args,
-                        gint         return_type)
+peas_lua_internal_call (lua_State  *L,
+                        const char *name,
+                        guint       n_args,
+                        int         return_type)
 {
   /* Get the Hooks table */
   lua_pushlightuserdata (L, &hooks_key);
diff --git a/loaders/lua5.1/peas-lua-internal.h b/loaders/lua5.1/peas-lua-internal.h
index 5624e34..ce75cb6 100644
--- a/loaders/lua5.1/peas-lua-internal.h
+++ b/loaders/lua5.1/peas-lua-internal.h
@@ -28,12 +28,11 @@
 
 G_BEGIN_DECLS
 
-gboolean  peas_lua_internal_setup    (lua_State   *L);
-void      peas_lua_internal_shutdown (lua_State   *L);
-
-gboolean  peas_lua_internal_call     (lua_State   *L,
-                                      const gchar *name,
-                                      guint        n_args,
-                                      gint         return_type);
+gboolean  peas_lua_internal_setup    (lua_State  *L);
+void      peas_lua_internal_shutdown (lua_State  *L);
+gboolean  peas_lua_internal_call     (lua_State  *L,
+                                      const char *name,
+                                      guint       n_args,
+                                      int         return_type);
 
 G_END_DECLS
diff --git a/loaders/lua5.1/peas-lua-utils.c b/loaders/lua5.1/peas-lua-utils.c
index a74fa34..955473a 100644
--- a/loaders/lua5.1/peas-lua-utils.c
+++ b/loaders/lua5.1/peas-lua-utils.c
@@ -31,8 +31,8 @@
 
 
 gboolean
-peas_lua_utils_require (lua_State   *L,
-                        const gchar *name)
+peas_lua_utils_require (lua_State  *L,
+                        const char *name)
 {
   luaL_checkstack (L, 2, "");
 
@@ -69,11 +69,11 @@ peas_lua_utils_check_version (lua_State *L,
                               guint      req_minor,
                               guint      req_micro)
 {
-  const gchar *version_str;
-  gchar **version_str_parts;
-  gint n_version_parts;
+  const char *version_str;
+  char **version_str_parts;
+  int n_version_parts;
   gint64 *version_parts;
-  gint i;
+  int i;
   gboolean success = FALSE;
 
   lua_getfield (L, -1, "_VERSION");
@@ -86,7 +86,7 @@ peas_lua_utils_check_version (lua_State *L,
 
   for (i = 0; i < n_version_parts; ++i)
     {
-      gchar *end;
+      char *end;
 
       version_parts[i] = g_ascii_strtoll (version_str_parts[i], &end, 10);
 
@@ -120,7 +120,7 @@ error:
   return success;
 }
 
-static gint
+static int
 traceback (lua_State *L)
 {
   /* Always ignore an error that isn't a string */
@@ -176,16 +176,16 @@ peas_lua_utils_call (lua_State *L,
 }
 
 gboolean
-peas_lua_utils_load_resource (lua_State   *L,
-                              const gchar *name,
-                              guint        n_args,
-                              guint        n_results)
+peas_lua_utils_load_resource (lua_State  *L,
+                              const char *name,
+                              guint       n_args,
+                              guint       n_results)
 {
-  gchar *resource_path;
+  char *resource_path;
   GBytes *lua_resource;
-  const gchar *code;
+  const char *code;
   gsize code_len;
-  gchar *lua_filename;
+  char *lua_filename;
 
   /* We don't use the byte-compiled Lua source
    * because glib-compile-resources cannot output
diff --git a/loaders/lua5.1/peas-lua-utils.h b/loaders/lua5.1/peas-lua-utils.h
index 15352df..4183854 100644
--- a/loaders/lua5.1/peas-lua-utils.h
+++ b/loaders/lua5.1/peas-lua-utils.h
@@ -30,19 +30,16 @@ G_BEGIN_DECLS
 
 
 gboolean peas_lua_utils_require       (lua_State   *L,
-                                       const gchar *name);
-
+                                       const char  *name);
 gboolean peas_lua_utils_check_version (lua_State   *L,
                                        guint        req_major,
                                        guint        req_minor,
                                        guint        req_micro);
-
 gboolean peas_lua_utils_call          (lua_State   *L,
                                        guint        n_args,
                                        guint        n_results);
-
 gboolean peas_lua_utils_load_resource (lua_State   *L,
-                                       const gchar *name,
+                                       const char  *name,
                                        guint        n_args,
                                        guint        n_results);