i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an oversight of yesterday's restructuring:

Browse Source 
* FDCloser is private, so it should live in BPackageKit::BHPKG::BPrivate
* adjusted 'package' binary to no longer use FDCloser (trivial)
* minor cleanup in command_extract.cpp

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40329 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2011-01-31 08:50:37 +00:00
parent 8f621df7f5
commit ae53f5526b
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/package/hpkg/FDCloser.h
+7 -3
View File
@@ -2,14 +2,16 @@
* Copyright 2009, Ingo Weinhold, [email protected]. * Copyright 2009, Ingo Weinhold, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _PACKAGE__HPKG__FD_CLOSER_H_ #ifndef _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
#define _PACKAGE__HPKG__FD_CLOSER_H_ #define _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
namespace BPackageKit { namespace BPackageKit {
namespace BHPKG { namespace BHPKG {
namespace BPrivate {
struct FDCloser { struct FDCloser {
FDCloser(int fd) FDCloser(int fd)
@@ -29,9 +31,11 @@ private:
}; };
} // namespace BPrivate
} // namespace BHPKG } // namespace BHPKG
} // namespace BPackageKit } // namespace BPackageKit
#endif // _PACKAGE__HPKG__FD_CLOSER_H_ #endif // _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
src/bin/package/command_extract.cpp
+2 -5
View File
@@ -21,7 +21,6 @@
#include <AutoDeleter.h> #include <AutoDeleter.h>
#include <package/hpkg/FDCloser.h>
#include <package/hpkg/PackageContentHandler.h> #include <package/hpkg/PackageContentHandler.h>
#include <package/hpkg/PackageDataReader.h> #include <package/hpkg/PackageDataReader.h>
#include <package/hpkg/PackageEntry.h> #include <package/hpkg/PackageEntry.h>
@@ -198,7 +197,6 @@ struct PackageContentExtractHandler : BPackageContentHandler {
strerror(errno)); strerror(errno));
return errno; return errno;
} }
FDCloser fdCloser(fd);
// write data // write data
status_t error; status_t error;
@@ -210,10 +208,9 @@ struct PackageContentExtractHandler : BPackageContentHandler {
} else } else
error = _ExtractFileData(&fPackageFileReader, data, fd); error = _ExtractFileData(&fPackageFileReader, data, fd);
if (error != B_OK) close(fd);
return error;
return B_OK; return error;
} }
virtual status_t HandleEntryDone(BPackageEntry* entry) virtual status_t HandleEntryDone(BPackageEntry* entry)