RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:17:34 +00:00
Code Issues Activity Actions

LibArchive: Move method implementations away from header

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-05-15 12:38:40 +02:00 • committed by Linus Groh
parent 3038edab00
commit d0eb376520
3 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibArchive/CMakeLists.txt
View file

@ -1,4 +1,5 @@
set(SOURCES
Tar.cpp
TarStream.cpp
Zip.cpp
)

33
Userland/Libraries/LibArchive/Tar.cpp Normal file
View file

@ -0,0 +1,33 @@
/*
* Copyright (c) 2020, Peter Elliott <pelliott@ualberta.ca>
* Copyright (c) 2021, Idan Horowitz <idan.horowitz@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "Tar.h"
namespace Archive {
unsigned TarFileHeader::expected_checksum() const
{
auto checksum = 0u;
const u8* u8_this = reinterpret_cast<const u8*>(this);
const u8* u8_m_checksum = reinterpret_cast<const u8*>(&m_checksum);
for (auto i = 0u; i < sizeof(TarFileHeader); ++i) {
if (u8_this + i >= u8_m_checksum && u8_this + i < u8_m_checksum + sizeof(m_checksum)) {
checksum += ' ';
} else {
checksum += u8_this[i];
}
}
return checksum;
}
void TarFileHeader::calculate_checksum()
{
memset(m_checksum, ' ', sizeof(m_checksum));
VERIFY(String::formatted("{:06o}", expected_checksum()).copy_characters_to_buffer(m_checksum, sizeof(m_checksum)));
}
}

20
Userland/Libraries/LibArchive/Tar.h
View file

@ -113,24 +113,4 @@ size_t TarFileHeader::get_tar_field(const char (&field)[N])
return value;
}
unsigned TarFileHeader::expected_checksum() const
{
auto checksum = 0u;
const u8* u8_this = reinterpret_cast<const u8*>(this);
const u8* u8_m_checksum = reinterpret_cast<const u8*>(&m_checksum);
for (auto i = 0u; i < sizeof(TarFileHeader); ++i) {
if (u8_this + i >= u8_m_checksum && u8_this + i < u8_m_checksum + sizeof(m_checksum)) {
checksum += ' ';
} else {
checksum += u8_this[i];
}
}
return checksum;
}
void TarFileHeader::calculate_checksum()
{
memset(m_checksum, ' ', sizeof(m_checksum));
VERIFY(String::formatted("{:06o}", expected_checksum()).copy_characters_to_buffer(m_checksum, sizeof(m_checksum)));
}
}