Various fixes and cleanups

[wimlib] / src / comp.h

diff --git a/src/comp.h b/src/comp.h
index 7b5f6c6bfd94e5f41f9e6da30f35a654f4671f85..37b1f9922bfecc1c53c8687ff38965804aa93331 100644 (file)
--- a/src/comp.h
+++ b/src/comp.h
@@ -20,7 +20,7 @@ struct output_bitstream {
        output_bitbuf_t bitbuf;
 
        /* Number of free bits in @bitbuf */
-       uint free_bits;
+       unsigned free_bits;
 
        u8 *bit_output;
        u8 *next_bit_output;
@@ -33,11 +33,10 @@ struct output_bitstream {
        int num_bytes_remaining;
 };
 
-
 static inline int bitstream_put_byte(struct output_bitstream *ostream,
-                                     u8 n)
+                                    u8 n)
 {
-       if (ostream->num_bytes_remaining == 0)
+       if (ostream->num_bytes_remaining < 1)
                return 1;
        *ostream->output = n;
        ostream->output++;
@@ -56,40 +55,41 @@ static inline int bitstream_put_two_bytes(struct output_bitstream *ostream,
        return 0;
 }
 
-
 struct lz_params {
-       uint min_match;
-       uint max_match;
-       uint nice_match;
-       uint good_match;
-       uint max_chain_len;
-       uint max_lazy_match;
-       uint too_far;
+       unsigned min_match;
+       unsigned max_match;
+       unsigned nice_match;
+       unsigned good_match;
+       unsigned max_chain_len;
+       unsigned max_lazy_match;
+       unsigned too_far;
 };
-                                               
-typedef uint (*lz_record_match_t)(uint, uint, void *, void *);
-typedef uint (*lz_record_literal_t)(u8, void *);
-
-extern uint lz_analyze_block(const u8 uncompressed_data[], 
-                            uint uncompressed_len,
-                            u32 match_tab[], 
-                            lz_record_match_t record_match,
-                            lz_record_literal_t record_literal, 
-                            void *record_match_arg1,
-                            void *record_match_arg2, 
-                            void *record_literal_arg,
-                            const struct lz_params *params);
-
-extern int bitstream_put_bits(struct output_bitstream *ostream, 
+
+typedef unsigned (*lz_record_match_t)(unsigned, unsigned, void *, void *);
+typedef unsigned (*lz_record_literal_t)(u8, void *);
+
+extern unsigned lz_analyze_block(const u8 uncompressed_data[],
+                                unsigned uncompressed_len,
+                                u32 match_tab[],
+                                lz_record_match_t record_match,
+                                lz_record_literal_t record_literal,
+                                void *record_match_arg1,
+                                void *record_match_arg2,
+                                void *record_literal_arg,
+                                const struct lz_params *params);
+
+extern int bitstream_put_bits(struct output_bitstream *ostream,
                              output_bitbuf_t bits, unsigned num_bits);
 
 extern void init_output_bitstream(struct output_bitstream *ostream,
-                                               void *data, unsigned num_bytes);
+                                 void *data, unsigned num_bytes);
 
 extern int flush_output_bitstream(struct output_bitstream *ostream);
 
-extern void make_canonical_huffman_code(uint num_syms, uint max_codeword_len, 
-                                       const u32 freq_tab[], u8 lens[], 
+extern void make_canonical_huffman_code(unsigned num_syms,
+                                       unsigned max_codeword_len,
+                                       const u32 freq_tab[],
+                                       u8 lens[],
                                        u16 codewords[]);
 
 #endif /* _WIMLIB_COMP_H */