From 15a5c3f7d91ab7657dc13deee1a18ef9e9c14567 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Mon, 31 Jan 2011 09:40:37 +0000
Subject: [PATCH] * follow hint by Axel: drop FDCloser and use shared class  
 FileDescriptorCloser instead

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40330 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/package/hpkg/FDCloser.h       | 41 -------------------
 .../kernel/file_systems/packagefs/Volume.cpp  |  1 -
 src/bin/package/command_create.cpp            | 11 -----
 src/kits/package/hpkg/PackageWriterImpl.cpp   |  6 ++-
 4 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 headers/private/package/hpkg/FDCloser.h

diff --git a/headers/private/package/hpkg/FDCloser.h b/headers/private/package/hpkg/FDCloser.h
deleted file mode 100644
index 4661f11d22..0000000000
--- a/headers/private/package/hpkg/FDCloser.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
- * Distributed under the terms of the MIT License.
- */
-#ifndef _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
-#define _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
-
-
-namespace BPackageKit {
-
-namespace BHPKG {
-
-namespace BPrivate {
-
-
-struct FDCloser {
-	FDCloser(int fd)
-		:
-		fFD(fd)
-	{
-	}
-
-	~FDCloser()
-	{
-		if (fFD >= 0)
-			close(fFD);
-	}
-
-private:
-	int	fFD;
-};
-
-
-}	// namespace BPrivate
-
-}	// namespace BHPKG
-
-}	// namespace BPackageKit
-
-
-#endif	// _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
index 5d2d6d7185..154971bb00 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
@@ -24,7 +24,6 @@
 #include <Notifications.h>
 
 #include <package/hpkg/ErrorOutput.h>
-#include <package/hpkg/FDCloser.h>
 #include <package/hpkg/PackageEntry.h>
 #include <package/hpkg/PackageEntryAttribute.h>
 #include <package/hpkg/PackageReaderImpl.h>
diff --git a/src/bin/package/command_create.cpp b/src/bin/package/command_create.cpp
index 133bb85ae6..39be18fbe6 100644
--- a/src/bin/package/command_create.cpp
+++ b/src/bin/package/command_create.cpp
@@ -94,17 +94,6 @@ printf("Init(): %s\n", strerror(error));
 					|| strcmp(entry->d_name, "..") == 0)
 					continue;
 
-if (strcmp(entry->d_name, B_HPKG_PACKAGE_INFO_FILE_NAME) == 0) {
-	printf("parsing %s ...\n", entry->d_name);
-	struct ErrorListener : public BPackageInfo::ParseErrorListener {
-		virtual void OnError(const BString& msg, int line, int col) {
-			printf("*** parse error (%d:%d) -> %s\n", line, col, msg.String());
-		}
-	} errorListener;
-	BEntry packageInfoEntry(entry->d_name);
-	BPackageInfo packageInfo;
-	packageInfo.ReadFromConfigFile(packageInfoEntry, &errorListener);
-}
 				error = packageWriter.AddEntry(entry->d_name);
 printf("AddEntry(\"%s\"): %s\n", entry->d_name, strerror(error));
 				if (error != B_OK)
diff --git a/src/kits/package/hpkg/PackageWriterImpl.cpp b/src/kits/package/hpkg/PackageWriterImpl.cpp
index b6f2fe5447..ed3f5ffc60 100644
--- a/src/kits/package/hpkg/PackageWriterImpl.cpp
+++ b/src/kits/package/hpkg/PackageWriterImpl.cpp
@@ -27,11 +27,13 @@
 
 #include <package/hpkg/DataOutput.h>
 #include <package/hpkg/DataReader.h>
-#include <package/hpkg/FDCloser.h>
 #include <package/hpkg/Stacker.h>
 #include <package/hpkg/ZlibCompressor.h>
 
 
+using BPrivate::FileDescriptorCloser;
+
+
 namespace BPackageKit {
 
 namespace BHPKG {
@@ -1089,7 +1091,7 @@ printf("PackageWriter::_AddEntry(%d, %p, \"%s\")\n", dirFD, entry, fileName);
 			fileName, strerror(errno));
 		throw status_t(errno);
 	}
-	FDCloser fdCloser(fd);
+	FileDescriptorCloser fdCloser(fd);
 
 	// stat the node
 	struct stat st;