More cleanup

[xonotic/gmqcc.git] / ftepp.c

diff --git a/ftepp.c b/ftepp.c
index d2c01df501d2a1b301d076b06226c3d2043ce5fd..1c80d9ed6f27287e71ddcd10b976da81f08cf6e8 100644 (file)
--- a/ftepp.c
+++ b/ftepp.c
@@ -1,26 +1,3 @@
-/*
- * Copyright (C) 2012, 2013, 2014, 2015
- *     Wolfgang Bumiller
- *     Dale Weiler
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 #include <string.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ -251,13 +228,7 @@ static pptoken *pptoken_make(ftepp_t *ftepp)
 {
     pptoken *token = (pptoken*)mem_a(sizeof(pptoken));
     token->token = ftepp->token;
-#if 0
-    if (token->token == TOKEN_WHITE)
-        token->value = util_strdup(" ");
-    else
-#else
-        token->value = util_strdup(ftepp_tokval(ftepp));
-#endif
+    token->value = util_strdup(ftepp_tokval(ftepp));
     memcpy(&token->constval, &ftepp->lex->tok.constval, sizeof(token->constval));
     return token;
 }
@@ -1323,7 +1294,7 @@ static void unescape(const char *str, char *out) {
 
 static char *ftepp_include_find_path(const char *file, const char *pathfile)
 {
-    fs_file_t  *fp;
+    FILE *fp;
     char       *filename = NULL;
     const char *last_slash;
     size_t      len;
@@ -1343,9 +1314,9 @@ static char *ftepp_include_find_path(const char *file, const char *pathfile)
     memcpy(vec_add(filename, len+1), file, len);
     vec_last(filename) = 0;
 
-    fp = fs_file_open(filename, "rb");
+    fp = fopen(filename, "rb");
     if (fp) {
-        fs_file_close(fp);
+        fclose(fp);
         return filename;
     }
     vec_free(filename);
@@ -1754,10 +1725,6 @@ static bool ftepp_preprocess(ftepp_t *ftepp)
     {
         if (ftepp->token >= TOKEN_EOF)
             break;
-#if 0
-        newline = true;
-#endif
-
         switch (ftepp->token) {
             case TOKEN_KEYWORD:
             case TOKEN_IDENT: