Remove msvc project files and misc stuff

[xonotic/gmqcc.git] / code.c

diff --git a/code.c b/code.c
index 5703e5098b60131251ba96ec7d34df62efaa2e11..811b0859100b52f11ec7adc6e31c582d4cd520fa 100644 (file)
--- a/code.c
+++ b/code.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013
+ * Copyright (C) 2012, 2013, 2014, 2015
  *     Dale Weiler
  *     Wolfgang Bumiller
  *
@@ -37,7 +37,7 @@
  */
 typedef union {
     void   *enter;
-    qcint_t   leave;
+    qcint_t leave;
 } code_hash_entry_t;
 
 /* Some sanity macros */
@@ -260,26 +260,18 @@ static void code_create_header(code_t *code, prog_header_t *code_header, const c
     }
 
     /* ensure all data is in LE format */
-    util_endianswap(&code_header->version,    1, sizeof(code_header->version));
-    util_endianswap(&code_header->crc16,      1, sizeof(code_header->crc16));
-    util_endianswap(&code_header->statements, 2, sizeof(code_header->statements.offset));
-    util_endianswap(&code_header->defs,       2, sizeof(code_header->statements.offset));
-    util_endianswap(&code_header->fields,     2, sizeof(code_header->statements.offset));
-    util_endianswap(&code_header->functions,  2, sizeof(code_header->statements.offset));
-    util_endianswap(&code_header->strings,    2, sizeof(code_header->statements.offset));
-    util_endianswap(&code_header->globals,    2, sizeof(code_header->statements.offset));
-    util_endianswap(&code_header->entfield,   1, sizeof(code_header->entfield));
+    util_swap_header(code_header);
 
     /*
      * These are not part of the header but we ensure LE format here to save on duplicated
      * code.
      */
-    util_endianswap(code->statements, vec_size(code->statements), sizeof(prog_section_statement_t));
-    util_endianswap(code->defs,       vec_size(code->defs),       sizeof(prog_section_def_t));
-    util_endianswap(code->fields,     vec_size(code->fields),     sizeof(prog_section_field_t));
-    util_endianswap(code->functions,  vec_size(code->functions),  sizeof(prog_section_function_t));
-    util_endianswap(code->globals,    vec_size(code->globals),    sizeof(int32_t));
 
+    util_swap_statements (code->statements);
+    util_swap_defs_fields(code->defs);
+    util_swap_defs_fields(code->fields);
+    util_swap_functions  (code->functions);
+    util_swap_globals    (code->globals);
 
     if (!OPTS_OPTION_BOOL(OPTION_QUIET)) {
         if (lnofile)
@@ -401,14 +393,14 @@ static bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, u
 
 bool code_write(code_t *code, const char *filename, const char *lnofile) {
     prog_header_t  code_header;
-    FILE          *fp = NULL;
+    FILE     *fp = NULL;
 
     code_create_header(code, &code_header, filename, lnofile);
 
     if (lnofile) {
         uint32_t version = 1;
 
-        fp = fs_file_open(lnofile, "wb");
+        fp = fopen(lnofile, "wb");
         if (!fp)
             return false;
 
@@ -416,39 +408,39 @@ bool code_write(code_t *code, const char *filename, const char *lnofile) {
         util_endianswap(code->linenums,   vec_size(code->linenums),   sizeof(code->linenums[0]));
         util_endianswap(code->columnnums, vec_size(code->columnnums), sizeof(code->columnnums[0]));
 
-        if (fs_file_write("LNOF",                          4,                                      1,                          fp) != 1 ||
-            fs_file_write(&version,                        sizeof(version),                        1,                          fp) != 1 ||
-            fs_file_write(&code_header.defs.length,        sizeof(code_header.defs.length),        1,                          fp) != 1 ||
-            fs_file_write(&code_header.globals.length,     sizeof(code_header.globals.length),     1,                          fp) != 1 ||
-            fs_file_write(&code_header.fields.length,      sizeof(code_header.fields.length),      1,                          fp) != 1 ||
-            fs_file_write(&code_header.statements.length,  sizeof(code_header.statements.length),  1,                          fp) != 1 ||
-            fs_file_write(code->linenums,                  sizeof(code->linenums[0]),              vec_size(code->linenums),   fp) != vec_size(code->linenums) ||
-            fs_file_write(code->columnnums,                sizeof(code->columnnums[0]),            vec_size(code->columnnums), fp) != vec_size(code->columnnums))
+        if (fwrite("LNOF",                          4,                                      1,                          fp) != 1 ||
+            fwrite(&version,                        sizeof(version),                        1,                          fp) != 1 ||
+            fwrite(&code_header.defs.length,        sizeof(code_header.defs.length),        1,                          fp) != 1 ||
+            fwrite(&code_header.globals.length,     sizeof(code_header.globals.length),     1,                          fp) != 1 ||
+            fwrite(&code_header.fields.length,      sizeof(code_header.fields.length),      1,                          fp) != 1 ||
+            fwrite(&code_header.statements.length,  sizeof(code_header.statements.length),  1,                          fp) != 1 ||
+            fwrite(code->linenums,                  sizeof(code->linenums[0]),              vec_size(code->linenums),   fp) != vec_size(code->linenums) ||
+            fwrite(code->columnnums,                sizeof(code->columnnums[0]),            vec_size(code->columnnums), fp) != vec_size(code->columnnums))
         {
             con_err("failed to write lno file\n");
         }
 
-        fs_file_close(fp);
+        fclose(fp);
         fp = NULL;
     }
 
-    fp = fs_file_open(filename, "wb");
+    fp = fopen(filename, "wb");
     if (!fp)
         return false;
 
-    if (1                          != fs_file_write(&code_header,     sizeof(prog_header_t)           , 1                         , fp) ||
-        vec_size(code->statements) != fs_file_write(code->statements, sizeof(prog_section_statement_t), vec_size(code->statements), fp) ||
-        vec_size(code->defs)       != fs_file_write(code->defs,       sizeof(prog_section_def_t)      , vec_size(code->defs)      , fp) ||
-        vec_size(code->fields)     != fs_file_write(code->fields,     sizeof(prog_section_field_t)    , vec_size(code->fields)    , fp) ||
-        vec_size(code->functions)  != fs_file_write(code->functions,  sizeof(prog_section_function_t) , vec_size(code->functions) , fp) ||
-        vec_size(code->globals)    != fs_file_write(code->globals,    sizeof(int32_t)                 , vec_size(code->globals)   , fp) ||
-        vec_size(code->chars)      != fs_file_write(code->chars,      1                               , vec_size(code->chars)     , fp))
+    if (1                          != fwrite(&code_header,     sizeof(prog_header_t)           , 1                         , fp) ||
+        vec_size(code->statements) != fwrite(code->statements, sizeof(prog_section_statement_t), vec_size(code->statements), fp) ||
+        vec_size(code->defs)       != fwrite(code->defs,       sizeof(prog_section_def_t)      , vec_size(code->defs)      , fp) ||
+        vec_size(code->fields)     != fwrite(code->fields,     sizeof(prog_section_field_t)    , vec_size(code->fields)    , fp) ||
+        vec_size(code->functions)  != fwrite(code->functions,  sizeof(prog_section_function_t) , vec_size(code->functions) , fp) ||
+        vec_size(code->globals)    != fwrite(code->globals,    sizeof(int32_t)                 , vec_size(code->globals)   , fp) ||
+        vec_size(code->chars)      != fwrite(code->chars,      1                               , vec_size(code->chars)     , fp))
     {
-        fs_file_close(fp);
+        fclose(fp);
         return false;
     }
 
-    fs_file_close(fp);
+    fclose(fp);
     code_stats(filename, lnofile, code, &code_header);
     return true;
 }