Constant folding for strings

[xonotic/gmqcc.git] / pak.c

diff --git a/pak.c b/pak.c
index eb523967ec40169fd808877764ad8f071d2018ca..9781c53aa2f8a9bcc3a603809cc3d48812e7c840 100644 (file)
--- a/pak.c
+++ b/pak.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *     Dale Weiler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -146,9 +146,9 @@ static pak_file_t *pak_open_read(const char *file) {
     memset         (&pak->header, 0, sizeof(pak_header_t));
     fs_file_read   (&pak->header,    sizeof(pak_header_t), 1, pak->handle);
 
-    util_tolittleendian(&pak->header.magic,  sizeof(pak->header.magic));
-    util_tolittleendian(&pak->header.diroff, sizeof(pak->header.diroff));
-    util_tolittleendian(&pak->header.dirlen, sizeof(pak->header.dirlen));
+    util_endianswap(&pak->header.magic,  1, sizeof(pak->header.magic));
+    util_endianswap(&pak->header.diroff, 1, sizeof(pak->header.diroff));
+    util_endianswap(&pak->header.dirlen, 1, sizeof(pak->header.dirlen));
 
     /*
      * Every PAK file has "PACK" stored as FOURCC data in the
@@ -176,8 +176,8 @@ static pak_file_t *pak_open_read(const char *file) {
         fs_file_read   (&dir,    sizeof(pak_directory_t), 1, pak->handle);
 
         /* Don't translate name - it's just an array of bytes. */
-        util_tolittleendian(&dir.pos, sizeof(dir.pos));
-        util_tolittleendian(&dir.len, sizeof(dir.len));
+        util_endianswap(&dir.pos, 1, sizeof(dir.pos));
+        util_endianswap(&dir.len, 1, sizeof(dir.len));
 
         vec_push(pak->directories, dir);
     }
@@ -218,7 +218,7 @@ static pak_file_t *pak_open_write(const char *file) {
     pak->header.magic = PAK_FOURCC;
 
     /* on BE systems we need to swap the byte order of the FOURCC */
-    util_tolittleendian(&pak->header.magic, sizeof(uint32_t));
+    util_endianswap(&pak->header.magic, 1, sizeof(uint32_t));
 
     /*
      * We need to write out the header since files will be wrote out to