From 3ad1037bcce52347c19b49ede50eeed8545e3cff Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 23 Jun 2011 21:28:35 +0200
Subject: [PATCH] Move set_dirent_name() to Utils.h

---
 .../kernel/file_systems/packagefs/Utils.h     | 19 +++++++++++++++++++
 .../packagefs/kernel_interface.cpp            | 16 +---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/packagefs/Utils.h b/src/add-ons/kernel/file_systems/packagefs/Utils.h
index 853792b017..e81b475cba 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Utils.h
+++ b/src/add-ons/kernel/file_systems/packagefs/Utils.h
@@ -6,6 +6,10 @@
 #define UTILS_H
 
 
+#include <dirent.h>
+#include <string.h>
+
+
 inline bool operator<(const timespec& a, const timespec& b)
 {
 	return a.tv_sec < b.tv_sec
@@ -19,4 +23,19 @@ inline bool operator>(const timespec& a, const timespec& b)
 }
 
 
+static inline bool
+set_dirent_name(struct dirent* buffer, size_t bufferSize, const char* name,
+	size_t nameLen)
+{
+	size_t length = (buffer->d_name + nameLen + 1) - (char*)buffer;
+	if (length > bufferSize)
+		return false;
+
+	memcpy(buffer->d_name, name, nameLen);
+	buffer->d_name[nameLen] = '\0';
+	buffer->d_reclen = length;
+	return true;
+}
+
+
 #endif	// UTILS_H
diff --git a/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp
index 7a5ad75cbe..7e140f6e5d 100644
--- a/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp
@@ -22,6 +22,7 @@
 #include "Directory.h"
 #include "GlobalFactory.h"
 #include "PackageFSRoot.h"
+#include "Utils.h"
 #include "Volume.h"
 
 
@@ -45,21 +46,6 @@ is_user_in_group(gid_t gid)
 }
 
 
-static bool
-set_dirent_name(struct dirent* buffer, size_t bufferSize, const char* name,
-	size_t nameLen)
-{
-	size_t length = (buffer->d_name + nameLen + 1) - (char*)buffer;
-	if (length > bufferSize)
-		return false;
-
-	memcpy(buffer->d_name, name, nameLen);
-	buffer->d_name[nameLen] = '\0';
-	buffer->d_reclen = length;
-	return true;
-}
-
-
 static status_t
 check_access(Node* node, int mode)
 {