Consistently use the name "solid resource"

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 51fc1f0452c6ddef1c9f87bf38e3e9f55bde0b35..c9116dfb88ada352a223f84f8a2d993273c2ed23 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -23,7 +23,16 @@
 #  include "config.h"
 #endif
 
+#include <errno.h>
+#include <fcntl.h>
+#ifndef __WIN32__
+#  include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <unistd.h>
+
 #include "wimlib.h"
+#include "wimlib/assert.h"
 #include "wimlib/bitops.h"
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
@@ -37,28 +46,18 @@
 #include "wimlib/security.h"
 #include "wimlib/wim.h"
 #include "wimlib/xml.h"
-#include "wimlib/version.h"
-
 #ifdef __WIN32__
 #  include "wimlib/win32.h" /* for realpath() replacement */
 #endif
 
-#include <errno.h>
-#include <fcntl.h>
-#ifndef __WIN32__
-#  include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <unistd.h>
-
 static int
-wim_default_pack_compression_type(void)
+wim_default_solid_compression_type(void)
 {
        return WIMLIB_COMPRESSION_TYPE_LZMS;
 }
 
 static u32
-wim_default_pack_chunk_size(int ctype) {
+wim_default_solid_chunk_size(int ctype) {
        switch (ctype) {
        case WIMLIB_COMPRESSION_TYPE_LZMS:
                return 1U << 25; /* 33554432  */
@@ -76,9 +75,9 @@ new_wim_struct(void)
 
        filedes_invalidate(&wim->in_fd);
        filedes_invalidate(&wim->out_fd);
-       wim->out_pack_compression_type = wim_default_pack_compression_type();
-       wim->out_pack_chunk_size = wim_default_pack_chunk_size(
-                                       wim->out_pack_compression_type);
+       wim->out_solid_compression_type = wim_default_solid_compression_type();
+       wim->out_solid_chunk_size = wim_default_solid_chunk_size(
+                                       wim->out_solid_compression_type);
        INIT_LIST_HEAD(&wim->subwims);
        return wim;
 }
@@ -536,13 +535,13 @@ wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
 WIMLIBAPI int
 wimlib_set_output_pack_compression_type(WIMStruct *wim, int ctype)
 {
-       int ret = set_out_ctype(ctype, &wim->out_pack_compression_type);
+       int ret = set_out_ctype(ctype, &wim->out_solid_compression_type);
        if (ret)
                return ret;
 
        /* Reset the chunk size if it's no longer valid.  */
-       if (!wim_chunk_size_valid(wim->out_pack_chunk_size, ctype))
-               wim->out_pack_chunk_size = wim_default_pack_chunk_size(ctype);
+       if (!wim_chunk_size_valid(wim->out_solid_chunk_size, ctype))
+               wim->out_solid_chunk_size = wim_default_solid_chunk_size(ctype);
        return 0;
 }
 
@@ -576,14 +575,14 @@ WIMLIBAPI int
 wimlib_set_output_pack_chunk_size(WIMStruct *wim, uint32_t chunk_size)
 {
        if (chunk_size == 0) {
-               wim->out_pack_chunk_size =
-                       wim_default_pack_chunk_size(wim->out_pack_compression_type);
+               wim->out_solid_chunk_size =
+                       wim_default_solid_chunk_size(wim->out_solid_compression_type);
                return 0;
        }
 
        return set_out_chunk_size(chunk_size,
-                                 wim->out_pack_compression_type,
-                                 &wim->out_pack_chunk_size);
+                                 wim->out_solid_compression_type,
+                                 &wim->out_solid_chunk_size);
 }
 
 WIMLIBAPI void
@@ -917,7 +916,9 @@ test_locale_ctype_utf8(void)
 WIMLIBAPI u32
 wimlib_get_version(void)
 {
-       return WIMLIB_VERSION_CODE;
+       return (WIMLIB_MAJOR_VERSION << 20) |
+              (WIMLIB_MINOR_VERSION << 10) |
+               WIMLIB_PATCH_VERSION;
 }
 
 static bool lib_initialized = false;