← Back to branch summary

~ubuntu-branches/ubuntu/precise/libgsf/precise

« back to all changes in this revision

Viewing changes to gsf/gsf-infile-zip.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2010-05-23 16:50:07 UTC
  • mfrom: (1.1.16 upstream) (2.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100523165007-j4lsgzfv9ogoxdpu
Tags: 1.14.18-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Call intltool-update -p at build time to get a .pot file

Show diffs side-by-side

added added

removed removed

Lines of Context:
gsf/gsf-infile-zip.c
191
191
                { 'P', 'K', 0x01, 0x02 };
192
192
        GsfZipDirent *dirent;
193
193
        guint8 const *data;
194
 
        guint16 name_len, extras_len, comment_len, compr_method;
 
194
        guint16 name_len, extras_len, comment_len, compr_method, flags;
195
195
        guint32 crc32, csize, usize, off;
196
196
        gchar *name;
197
197
 
206
206
        extras_len =    GSF_LE_GET_GUINT16 (data + ZIP_DIRENT_EXTRAS_SIZE);
207
207
        comment_len =   GSF_LE_GET_GUINT16 (data + ZIP_DIRENT_COMMENT_SIZE);
208
208
 
 
209
        flags =         GSF_LE_GET_GUINT32 (data + ZIP_DIRENT_FLAGS);
209
210
        compr_method =  GSF_LE_GET_GUINT16 (data + ZIP_DIRENT_COMPR_METHOD);
210
211
        crc32 =         GSF_LE_GET_GUINT32 (data + ZIP_DIRENT_CRC32);
211
212
        csize =         GSF_LE_GET_GUINT32 (data + ZIP_DIRENT_CSIZE);
222
223
        dirent = gsf_zip_dirent_new ();
223
224
        dirent->name = name;
224
225
 
 
226
        dirent->flags = flags;
225
227
        dirent->compr_method =  compr_method;
226
228
        dirent->crc32 =         crc32;
227
229
        dirent->csize =         csize;