diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-10-26 22:10:24 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-11-28 19:29:37 +0100 |
| commit | d6b31fa5ab71b8b08b09ff1635dd0537de011be2 (patch) | |
| tree | cfc2e3c17e51fbc331992e9a8db8486e478067b6 /src/libpts/tcg | |
| parent | 898c3f995f230b5d225180edd662ddc3d9e8180c (diff) | |
| download | strongswan-d6b31fa5ab71b8b08b09ff1635dd0537de011be2.tar.bz2 strongswan-d6b31fa5ab71b8b08b09ff1635dd0537de011be2.tar.xz | |
shortened fieldnames of pts_file_metadata_t struct
Diffstat (limited to 'src/libpts/tcg')
| -rw-r--r-- | src/libpts/tcg/tcg_pts_attr_unix_file_meta.c | 22 |
1 files changed, 0 insertions, 22 deletions
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 8c9d42895..ecdc4c928 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); |