From e28002a1a3af501e62bdba11dae58e27c0b69cda Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 25 Jan 2012 16:34:16 -0500
Subject: [PATCH] fileutils: keep functions out of global namespace
---
daemon/src/audio/codecs/audiocodecfactory.cpp | 2 +-
daemon/src/fileutils.cpp | 3 +++
daemon/src/fileutils.h | 6 ++++--
daemon/src/main.cpp | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/daemon/src/audio/codecs/audiocodecfactory.cpp b/daemon/src/audio/codecs/audiocodecfactory.cpp
index 1bbc5006f6..6436a6f636 100644
--- a/daemon/src/audio/codecs/audiocodecfactory.cpp
+++ b/daemon/src/audio/codecs/audiocodecfactory.cpp
@@ -155,7 +155,7 @@ std::vector<sfl::Codec*> AudioCodecFactory::scanCodecDirectory()
if (envDir)
dirToScan.push_back(std::string(envDir) + DIR_SEPARATOR_STR);
- const char *progDir = get_program_dir();
+ const char *progDir = fileutils::get_program_dir();
if (progDir)
dirToScan.push_back(std::string(progDir) + DIR_SEPARATOR_STR + "audio/codecs/");
diff --git a/daemon/src/fileutils.cpp b/daemon/src/fileutils.cpp
index 60279ec639..e03ff6df20 100644
--- a/daemon/src/fileutils.cpp
+++ b/daemon/src/fileutils.cpp
@@ -31,6 +31,7 @@
#include <libgen.h>
#include <cstdlib>
+namespace fileutils {
static char *program_dir = NULL;
void set_program_dir(char *program_path)
@@ -42,3 +43,5 @@ const char *get_program_dir()
{
return program_dir;
}
+
+}
diff --git a/daemon/src/fileutils.h b/daemon/src/fileutils.h
index 92f99a6a28..c7188cb0d7 100644
--- a/daemon/src/fileutils.h
+++ b/daemon/src/fileutils.h
@@ -31,7 +31,9 @@
#ifndef __FILEUTILS_H__
#define __FILEUTILS_H__
-void set_program_dir(char *program_path);
-const char *get_program_dir();
+namespace fileutils {
+ void set_program_dir(char *program_path);
+ const char *get_program_dir();
+}
#endif // __FILEUTILS_H__
diff --git a/daemon/src/main.cpp b/daemon/src/main.cpp
index 4423af4177..1d92cfbb5f 100644
--- a/daemon/src/main.cpp
+++ b/daemon/src/main.cpp
@@ -78,7 +78,7 @@ static bool check_dir(const char *path)
int
main(int argc, char **argv)
{
- set_program_dir(argv[0]);
+ fileutils::set_program_dir(argv[0]);
// makeCommandOptionParse allocates the object with operator new, so
// auto_ptr is fine in this context.
// TODO: This should eventually be replaced with std::unique_ptr for C++0x
--
GitLab