shithub: trueawk

Info  •  Files  •  Log  •  Branches

More minor fixes: (#73)

* More minor fixes:

- add missing initializers
- fix sign-compare warnings
- fix shadowed variable

--- a/lib.c

+++ b/lib.c

@@ -55,8 +55,8 @@

 int	argno	= 1;	/* current input argument number */

 extern	Awkfloat *ARGC;

-static Cell dollar0 = { OCELL, CFLD, NULL, EMPTY, 0.0, REC|STR|DONTFREE };

-static Cell dollar1 = { OCELL, CFLD, NULL, EMPTY, 0.0, FLD|STR|DONTFREE };

+static Cell dollar0 = { OCELL, CFLD, NULL, EMPTY, 0.0, REC|STR|DONTFREE, NULL, NULL };

+static Cell dollar1 = { OCELL, CFLD, NULL, EMPTY, 0.0, FLD|STR|DONTFREE, NULL, NULL };

 void recinit(unsigned int n)

 {

@@ -461,7 +461,7 @@

 	if (n > nf)

 		nf = n;

 	s = (nf+1) * (sizeof (struct Cell *));  /* freebsd: how much do we need? */

-	if (s / sizeof(struct Cell *) - 1 == nf) /* didn't overflow */

+	if (s / sizeof(struct Cell *) - 1 == (size_t)nf) /* didn't overflow */

 		fldtab = realloc(fldtab, s);

 	else					/* overflow sizeof int */

 		xfree(fldtab);	/* make it null */

--- a/run.c

+++ b/run.c

@@ -77,23 +77,23 @@

 Node	*winner = NULL;	/* root of parse tree */

 Cell	*tmps;		/* free temporary cells for execution */

-static Cell	truecell	={ OBOOL, BTRUE, 0, 0, 1.0, NUM, NULL };

+static Cell	truecell	={ OBOOL, BTRUE, 0, 0, 1.0, NUM, NULL, NULL };

 Cell	*True	= &truecell;

-static Cell	falsecell	={ OBOOL, BFALSE, 0, 0, 0.0, NUM, NULL };

+static Cell	falsecell	={ OBOOL, BFALSE, 0, 0, 0.0, NUM, NULL, NULL };

 Cell	*False	= &falsecell;

-static Cell	breakcell	={ OJUMP, JBREAK, 0, 0, 0.0, NUM, NULL };

+static Cell	breakcell	={ OJUMP, JBREAK, 0, 0, 0.0, NUM, NULL, NULL };

 Cell	*jbreak	= &breakcell;

-static Cell	contcell	={ OJUMP, JCONT, 0, 0, 0.0, NUM, NULL };

+static Cell	contcell	={ OJUMP, JCONT, 0, 0, 0.0, NUM, NULL, NULL };

 Cell	*jcont	= &contcell;

-static Cell	nextcell	={ OJUMP, JNEXT, 0, 0, 0.0, NUM, NULL };

+static Cell	nextcell	={ OJUMP, JNEXT, 0, 0, 0.0, NUM, NULL, NULL };

 Cell	*jnext	= &nextcell;

-static Cell	nextfilecell	={ OJUMP, JNEXTFILE, 0, 0, 0.0, NUM, NULL };

+static Cell	nextfilecell	={ OJUMP, JNEXTFILE, 0, 0, 0.0, NUM, NULL, NULL };

 Cell	*jnextfile	= &nextfilecell;

-static Cell	exitcell	={ OJUMP, JEXIT, 0, 0, 0.0, NUM, NULL };

+static Cell	exitcell	={ OJUMP, JEXIT, 0, 0, 0.0, NUM, NULL, NULL };

 Cell	*jexit	= &exitcell;

-static Cell	retcell		={ OJUMP, JRET, 0, 0, 0.0, NUM, NULL };

+static Cell	retcell		={ OJUMP, JRET, 0, 0, 0.0, NUM, NULL, NULL };

 Cell	*jret	= &retcell;

-static Cell	tempcell	={ OCELL, CTEMP, 0, EMPTY, 0.0, NUM|STR|DONTFREE, NULL };

+static Cell	tempcell	={ OCELL, CTEMP, 0, EMPTY, 0.0, NUM|STR|DONTFREE, NULL, NULL };

 Node	*curnode = NULL;	/* the node being executed, for debugging */

@@ -226,7 +226,7 @@

 Cell *call(Node **a, int n)	/* function call.  very kludgy and fragile */

 {

-	static const Cell newcopycell = { OCELL, CCOPY, 0, EMPTY, 0.0, NUM|STR|DONTFREE, NULL };

+	static const Cell newcopycell = { OCELL, CCOPY, 0, EMPTY, 0.0, NUM|STR|DONTFREE, NULL, NULL };

 	int i, ncall, ndef;

 	int freed = 0; /* handles potential double freeing when fcn & param share a tempcell */

 	Node *x;

@@ -828,10 +828,10 @@

 	static bool have_a_format = false;

 	if (first) {

-		char buf[100];

+		char xbuf[100];

-		snprintf(buf, sizeof(buf), "%a", 42.0);

-		have_a_format = (strcmp(buf, "0x1.5p+5") == 0);

+		snprintf(xbuf, sizeof(xbuf), "%a", 42.0);

+		have_a_format = (strcmp(xbuf, "0x1.5p+5") == 0);

 		first = false;

 	}

@@ -1869,7 +1869,7 @@

 static void flush_all(void)

 {

-	int i;

+	size_t i;

 	for (i = 0; i < nfiles; i++)

 		if (files[i].fp)

-- 

⑨