X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/e10d6e307623d0952f6e1f5d9fee8720ddab4808..c2cc7db1ccde3eb2ff723c4b7b213a055f56e8ae:/src/out.c

diff --git a/src/out.c b/src/out.c
index 77dabd1..2d66570 100644
--- a/src/out.c
+++ b/src/out.c
@@ -13,6 +13,8 @@ static gboolean in_outh = TRUE;
 int outphline = 1;
 static gboolean in_outph = TRUE;
 
+extern char file_sep;
+
 static int
 strchrcnt(char *s, char c)
 {
@@ -24,31 +26,37 @@ strchrcnt(char *s, char c)
 }
 
 void
-out_printf(FILE *fp,char *format,...)
+out_printf(FILE *fp, const char *format,...)
 {
 	va_list ap;
 	char *s;
 
-	va_start(ap,format);
-	s = g_strdup_vprintf(format,ap);
+	if (no_write)
+		return;
+
+	va_start(ap, format);
+	s = g_strdup_vprintf(format, ap);
 	va_end(ap);
 
 	if(fp == out)
-		outline += strchrcnt(s,'\n');
+		outline += strchrcnt(s, '\n');
 	else if(fp == outh)
-		outhline += strchrcnt(s,'\n');
+		outhline += strchrcnt(s, '\n');
 	else if(fp == outph)
-		outphline += strchrcnt(s,'\n');
+		outphline += strchrcnt(s, '\n');
 	else
 		g_assert_not_reached();
 
-	fprintf(fp,"%s",s);
+	fprintf(fp, "%s", s);
 	g_free(s);
 }
 
 void
 out_addline_infile(FILE *fp, int line)
 {
+	if(no_lines || no_write)
+		return;
+
 	if(fp == out) {
 		outline++;
 		in_out = FALSE;
@@ -61,12 +69,15 @@ out_addline_infile(FILE *fp, int line)
 	} else
 		g_assert_not_reached();
 
-	fprintf(fp,"#line %d \"%s\"\n",line,filename);
+	fprintf(fp, "#line %d \"%s\"\n", line, filename);
 }
 
 void
 out_addline_outfile(FILE *fp)
 {
+	if(no_lines || no_write)
+		return;
+
 	if(fp == out) {
 		if(in_out) return;
 		outline++;
@@ -81,9 +92,12 @@ out_addline_outfile(FILE *fp)
 		fprintf(fp,"#line %d \"%s.h\"\n",outhline,filebase);
 		in_outh = TRUE;
 	} else if(fp == outph) {
+		char sep[2] = {0,0};
 		if(in_outph) return;
 		outphline++;
-		fprintf(fp,"#line %d \"%s-private.h\"\n",outphline,filebase);
+		if (file_sep != 0)
+			sep[0] = file_sep;
+		fprintf(fp,"#line %d \"%s%sprivate.h\"\n",outphline,filebase,sep);
 		in_outph = TRUE;
 	} else
 		g_assert_not_reached();