← Back to branch summary

~ubuntu-branches/ubuntu/feisty/clamav/feisty

« back to all changes in this revision

Viewing changes to libclamav/unrar/unrar.h

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2007-02-20 10:33:44 UTC
  • mfrom: (0.7.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070220103344-yrxzd2x7lhee3r02
Tags: 0.90-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/clamav-base.init-stub, debian/clamav-daemon.init,
    debian/rules: init script stub for common setup functions.
  - debian/control: Maintainers updated for Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/unrar/unrar.h
121
121
typedef struct main_header_tag
122
122
{
123
123
        uint16_t head_crc __attribute__ ((packed));
124
 
        uint8_t head_type __attribute__ ((packed));
 
124
        uint8_t head_type;
125
125
        uint16_t flags __attribute__ ((packed));
126
126
        uint16_t head_size __attribute__ ((packed));
127
127
        uint16_t highposav __attribute__ ((packed));
131
131
typedef struct file_header_tag
132
132
{
133
133
        uint16_t head_crc __attribute__ ((packed));
134
 
        uint8_t head_type __attribute__ ((packed));
 
134
        uint8_t head_type;
135
135
        uint16_t flags __attribute__ ((packed));
136
136
        uint16_t head_size __attribute__ ((packed));
137
137
        uint32_t pack_size __attribute__ ((packed));
138
138
        uint32_t unpack_size __attribute__ ((packed));
139
 
        uint8_t host_os __attribute__ ((packed));
 
139
        uint8_t host_os;
140
140
        uint32_t file_crc __attribute__ ((packed));
141
141
        uint32_t file_time __attribute__ ((packed));
142
 
        uint8_t unpack_ver __attribute__ ((packed));
143
 
        uint8_t method __attribute__ ((packed));
 
142
        uint8_t unpack_ver;
 
143
        uint8_t method;
144
144
        uint16_t name_size __attribute__ ((packed));
145
145
        uint32_t file_attr __attribute__ ((packed));
146
146
        uint32_t high_pack_size __attribute__ ((packed));   /* optional */
153
153
typedef struct comment_header_tag
154
154
{
155
155
        uint16_t head_crc __attribute__ ((packed));
156
 
        uint8_t head_type __attribute__ ((packed));
 
156
        uint8_t head_type;
157
157
        uint16_t flags __attribute__ ((packed));
158
158
        uint16_t head_size __attribute__ ((packed));
159
159
        uint16_t unpack_size __attribute__ ((packed));
160
 
        uint8_t unpack_ver __attribute__ ((packed));
161
 
        uint8_t method __attribute__ ((packed));
 
160
        uint8_t unpack_ver;
 
161
        uint8_t method;
162
162
        uint16_t comm_crc __attribute__ ((packed));
163
163
} comment_header_t;
164
164