X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/7f1f40bee65a4a3d3947ad8c50b535ea0754f629..HEAD:/src/main.c

diff --git a/src/main.c b/src/main.c
index 4aea007..16f59dd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,9 +28,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <limits.h>
 #include <getopt.h>
 
@@ -133,11 +131,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"
@@ -1269,7 +1263,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
@@ -4778,25 +4772,27 @@ compare_and_move (const char *old_filename)
 		if (error)
 			goto end;
 
-		if (! equal && unlink (old_filename) != 0) {
-			error_printf (GOB_ERROR, 0, "Can't remove %s: %s",
-				      old_filename, g_strerror (errno));
+		if (!equal && remove(old_filename) != 0) {
+			error_printf(GOB_ERROR, 0, "Can't remove %s: %s",
+				     old_filename, g_strerror (errno));
 			goto end;
 		}
 	}
 
 	if (equal) {
-		if (unlink (new_filename) != 0)
-			error_printf (GOB_ERROR, 0, "Can't remove %s: %s",
-				      new_filename, g_strerror (errno));
+		if (remove(new_filename) != 0) {
+			error_printf(GOB_ERROR, 0, "Can't remove %s: %s",
+				     new_filename, g_strerror(errno));
+		}
 	} else {
-		if (rename (new_filename, old_filename) != 0)
-			error_printf (GOB_ERROR, 0, "Can't rename %s to %s: %s",
-				      new_filename, old_filename,
-				      g_strerror (errno));
+		if (rename(new_filename, old_filename) != 0) {
+			error_printf(GOB_ERROR, 0, "Can't rename %s to %s: %s",
+			             new_filename, old_filename,
+			             g_strerror(errno));
+		}
 	}
 
- end:
+end:
 	g_free (new_filename);
 }