From: Andreas Steffen Date: Wed, 26 Oct 2011 20:10:24 +0000 (+0200) Subject: shortened fieldnames of pts_file_metadata_t struct X-Git-Tag: 4.6.2~225 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6b31fa5ab71b8b08b09ff1635dd0537de011be2;p=thirdparty%2Fstrongswan.git shortened fieldnames of pts_file_metadata_t struct --- diff --git a/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c b/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c index 8c9d428953..ecdc4c9286 100644 --- a/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c +++ b/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c @@ -152,7 +152,6 @@ METHOD(pa_tnc_attr_t, build, void, enumerator = this->metadata->create_enumerator(this->metadata); while (enumerator->enumerate(enumerator, &entry)) { -<<<<<<< HEAD writer->write_uint16(writer, PTS_FILE_METADATA_SIZE + strlen(entry->filename)); writer->write_uint8 (writer, entry->type); @@ -165,27 +164,6 @@ METHOD(pa_tnc_attr_t, build, void, writer->write_uint64(writer, entry->group); writer->write_data (writer, chunk_create(entry->filename, strlen(entry->filename))); -======= - writer->write_uint16(writer, PTS_FILE_METADATA_SIZE + strlen(entry->filename)); - writer->write_uint8 (writer, entry->type); - writer->write_uint8 (writer, PTS_FILE_MEAS_RESERVED); - - /* Write the 64 bit integer fields as two 32 bit parts */ - writer->write_uint32(writer, entry->filesize >> 32); - writer->write_uint32(writer, entry->filesize & 0xffffffff); - writer->write_uint32(writer, ((u_int64_t)entry->create_time) >> 32); - writer->write_uint32(writer, ((u_int64_t)entry->create_time) & 0xffffffff); - writer->write_uint32(writer, ((u_int64_t)entry->last_modify_time) >> 32); - writer->write_uint32(writer, ((u_int64_t)entry->last_modify_time) & 0xffffffff); - writer->write_uint32(writer, ((u_int64_t)entry->last_access_time) >> 32); - writer->write_uint32(writer, ((u_int64_t)entry->last_access_time) & 0xffffffff); - writer->write_uint32(writer, entry->owner_id >> 32); - writer->write_uint32(writer, entry->owner_id & 0xffffffff); - writer->write_uint32(writer, entry->group_id >> 32); - writer->write_uint32(writer, entry->group_id & 0xffffffff); - - writer->write_data (writer, chunk_create(entry->filename, strlen(entry->filename))); ->>>>>>> Implemented handling of File Metadata } enumerator->destroy(enumerator);