Rename "prealloc" global variable.

[gob-dx.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 0e6c55c84c1709aeed581a94f1a7ac679a0bd689..73920ae0727f04ee1418438087e6f3335875b662 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -133,11 +133,7 @@ gboolean no_lines = FALSE;
 gboolean no_self_alias = FALSE;
 gboolean always_private_struct = FALSE;
 gboolean gtk3_ok = FALSE;
-
-gint prealloc = 0;
-
-
-
+gint npreallocs = 0;
 gboolean use_m4 = FALSE; /* preprocess sources with m4 */
 char *m4_commandline = NULL;
 #define M4_INCLUDE_DIR  PKGDATADIR "/m4"
@@ -153,9 +149,9 @@ make_bases (void)
        filebase = replace_sep (((Class *)class)->otype, file_sep);
        gob_strdown (filebase);
 
-       if (output_dir != NULL &&
-           output_dir[0] != '\0') {
-               fullfilebase = g_build_filename (output_dir, filebase, NULL);
+       if (output_dir != NULL && output_dir[0] != '\0') {
+               fullfilebase = g_strdup_printf("%s%c%s", output_dir,
+                                              G_DIR_SEPARATOR, filebase);
        } else {
                fullfilebase = g_strdup (filebase);
        }
@@ -1269,7 +1265,7 @@ static void add_type_info(void)
                        "\t\t(GInstanceInitFunc) %s_init,\n"
                        "\t\tNULL\n"
                        "\t};\n\n",
-                       typebase, funcbase, typebase, prealloc, funcbase);
+                       typebase, funcbase, typebase, npreallocs, funcbase);
 }
 
 static void
@@ -3165,6 +3161,7 @@ static char *
 get_arg_names_for_macro (Method *m)
 {
        const char *sep;
+       char *ret;
        GList *li;
        GString *gs = g_string_new(NULL);
        sep = "";
@@ -3173,7 +3170,10 @@ get_arg_names_for_macro (Method *m)
                g_string_append_printf(gs, "%s___%s", sep, arg->name);
                sep = ",";
        }
-       return g_string_free (gs, FALSE);
+
+       ret = gs->str;
+       g_string_free(gs, FALSE);
+       return ret;
 }
 
 static gboolean method_is_void(Method *m)