explicit casts, add includes

jpoirier · Jun 17, 2015 · 011ee0f · 011ee0f
1 parent 97fbbaa
commit 011ee0f
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 17 deletions.
diff --git a/cstdlib/math.c b/cstdlib/math.c
@@ -1,4 +1,5 @@
 /*  */
+#include <math.h>
 #include "../interpreter.h"
 
 

diff --git a/cstdlib/stdbool.c b/cstdlib/stdbool.c
@@ -1,4 +1,5 @@
 /*  */
+#include <stdbool.h>
 #include "../interpreter.h"
 
 

diff --git a/cstdlib/stdio.c b/cstdlib/stdio.c
@@ -1,10 +1,10 @@
 /*  */
-
+#include <stdio.h>
 #include <errno.h>
 #include "../interpreter.h"
 
-#define MAX_FORMAT 80
-#define MAX_SCANF_ARGS 10
+#define MAX_FORMAT (80)
+#define MAX_SCANF_ARGS (10)
 
 static int Stdio_ZeroValue = 0;
 static int EOFValue = EOF;

diff --git a/cstdlib/stdlib.c b/cstdlib/stdlib.c
@@ -1,4 +1,5 @@
 /*  */
+#include <stdlib.h>
 #include "../interpreter.h"
 
 

diff --git a/cstdlib/string.c b/cstdlib/string.c
@@ -1,4 +1,5 @@
 /*  */
+#include <string.h>
 #include "../interpreter.h"
 
 
@@ -176,13 +177,13 @@ void StringStrxfrm(struct ParseState *Parser, struct Value *ReturnValue,
 void StringStrdup(struct ParseState *Parser, struct Value *ReturnValue,
     struct Value **Param, int NumArgs)
 {
-    ReturnValue->Val->Pointer = strdup(Param[0]->Val->Pointer);
+    ReturnValue->Val->Pointer = (void*)strdup(Param[0]->Val->Pointer);
 }
 
 void StringStrtok_r(struct ParseState *Parser, struct Value *ReturnValue,
     struct Value **Param, int NumArgs)
 {
-    ReturnValue->Val->Pointer = strtok_r(Param[0]->Val->Pointer,
+    ReturnValue->Val->Pointer = (void*)strtok_r(Param[0]->Val->Pointer,
         Param[1]->Val->Pointer, Param[2]->Val->Pointer);
 }
 #endif

diff --git a/cstdlib/time.c b/cstdlib/time.c
@@ -82,7 +82,7 @@ void StdStrptime(struct ParseState *Parser, struct Value *ReturnValue,
 void StdGmtime_r(struct ParseState *Parser, struct Value *ReturnValue,
     struct Value **Param, int NumArgs)
 {
-    ReturnValue->Val->Pointer = gmtime_r(Param[0]->Val->Pointer,
+    ReturnValue->Val->Pointer = (void*)gmtime_r(Param[0]->Val->Pointer,
         Param[1]->Val->Pointer);
 }
 

diff --git a/cstdlib/unistd.c b/cstdlib/unistd.c
@@ -192,7 +192,7 @@ void UnistdGetpagesize(struct ParseState *Parser, struct Value *ReturnValue,
 void UnistdGetpass(struct ParseState *Parser, struct Value *ReturnValue,
     struct Value **Param, int NumArgs)
 {
-    ReturnValue->Val->Pointer = getpass(Param[0]->Val->Pointer);
+    ReturnValue->Val->Pointer = (void*)getpass(Param[0]->Val->Pointer);
 }
 
 #if 0

diff --git a/expression.c b/expression.c
@@ -749,7 +749,7 @@ void ExpressionPrefixOperator(struct ParseState *Parser,
             /* pointer prefix arithmetic */
             int Size = TypeSize(TopValue->Typ->FromType, 0, true);
             struct Value *StackValue;
-            void *ResultPtr;
+            void *ResultPtr = 0;
             if (Op != TokenUnaryNot && TopValue->Val->Pointer == NULL)
                 ProgramFail(Parser, "a. invalid use of a NULL pointer");
             if (!TopValue->IsLValue)

diff --git a/lex.c b/lex.c
@@ -54,13 +54,13 @@ struct ReservedWord {
 
 static struct ReservedWord ReservedWords[] = {
     /* wrf, when optimizations are set escaping certain chars is required or they disappear */
-    {"\#define", TokenHashDefine},
-    {"\#else", TokenHashElse},
-    {"\#endif", TokenHashEndif},
-    {"\#if", TokenHashIf},
-    {"\#ifdef", TokenHashIfdef},
-    {"\#ifndef", TokenHashIfndef},
-    {"\#include", TokenHashInclude},
+    {"#define", TokenHashDefine},
+    {"#else", TokenHashElse},
+    {"#endif", TokenHashEndif},
+    {"#if", TokenHashIf},
+    {"#ifdef", TokenHashIfdef},
+    {"#ifndef", TokenHashIfndef},
+    {"#include", TokenHashInclude},
     {"auto", TokenAutoType},
     {"break", TokenBreak},
     {"case", TokenCase},

diff --git a/picoc.h b/picoc.h
@@ -6,7 +6,7 @@
 
 /* picoc version number */
 #ifdef VER
-/* VER is the git hash number, obtained via the Makefile */
+/* VER, the git hash number, and TAG are obtained via the Makefile */
 #define PICOC_VERSION TAG " r" VER
 #else
 #define PICOC_VERSION "v2.2"

diff --git a/platform.h b/platform.h
@@ -50,7 +50,7 @@
 #define ALIGN_TYPE double
 #else
 /* the default data type to use for alignment */
-#define ALIGN_TYPE void *
+#define ALIGN_TYPE void*
 #endif
 
 #define GLOBAL_TABLE_SIZE (97)                /* global variable table */