From: "Daniel P. Berrange" <berrange(a)redhat.com>
To follow latest naming conventions, rename src/util/authhelper.[ch]
to src/util/virauth.[ch].
* src/util/authhelper.[ch]: Rename to src/util/virauth.[ch]
* src/esx/esx_driver.c, src/hyperv/hyperv_driver.c,
src/phyp/phyp_driver.c, src/xenapi/xenapi_driver.c: Update
for renamed include files
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/esx/esx_driver.c | 2 +-
src/hyperv/hyperv_driver.c | 2 +-
src/phyp/phyp_driver.c | 2 +-
src/util/{authhelper.c => virauth.c} | 5 ++---
src/util/{authhelper.h => virauth.h} | 9 ++++-----
src/xenapi/xenapi_driver.c | 2 +-
8 files changed, 12 insertions(+), 14 deletions(-)
rename src/util/{authhelper.c => virauth.c} (97%)
rename src/util/{authhelper.h => virauth.h} (87%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8354c09..8eaa8ad 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -106,7 +106,6 @@ src/storage/storage_driver.c
src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
-src/util/authhelper.c
src/util/cgroup.c
src/util/command.c
src/util/conf.c
@@ -124,6 +123,7 @@ src/util/stats_linux.c
src/util/storage_file.c
src/util/sysinfo.c
src/util/util.c
+src/util/virauth.c
src/util/viraudit.c
src/util/virfile.c
src/util/virhash.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 07d7faa..3cbf9d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ augeastest_DATA =
# These files are not related to driver APIs. Simply generic
# helper APIs for various purposes
UTIL_SOURCES = \
- util/authhelper.c util/authhelper.h \
util/bitmap.c util/bitmap.h \
util/buf.c util/buf.h \
util/command.c util/command.h \
@@ -81,6 +80,7 @@ UTIL_SOURCES = \
util/uuid.c util/uuid.h \
util/util.c util/util.h \
util/viraudit.c util/viraudit.h \
+ util/virauth.c util/virauth.h \
util/virfile.c util/virfile.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virpidfile.c util/virpidfile.h \
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 7e41fa3..51bd5b2 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "domain_conf.h"
-#include "authhelper.h"
+#include "virauth.h"
#include "util.h"
#include "memory.h"
#include "logging.h"
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 27c8747..5ca20cf 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "datatypes.h"
#include "domain_conf.h"
-#include "authhelper.h"
+#include "virauth.h"
#include "util.h"
#include "memory.h"
#include "logging.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index bdf4a7b..4b99465 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -44,7 +44,7 @@
#include <domain_event.h>
#include "internal.h"
-#include "authhelper.h"
+#include "virauth.h"
#include "util.h"
#include "datatypes.h"
#include "buf.h"
diff --git a/src/util/authhelper.c b/src/util/virauth.c
similarity index 97%
rename from src/util/authhelper.c
rename to src/util/virauth.c
index 9398cb3..a3c6b94 100644
--- a/src/util/authhelper.c
+++ b/src/util/virauth.c
@@ -1,6 +1,5 @@
-
/*
- * authhelper.c: authentication related utility functions
+ * virauth.c: authentication related utility functions
*
* Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com>
*
@@ -22,7 +21,7 @@
#include <config.h>
-#include "authhelper.h"
+#include "virauth.h"
#include "util.h"
#include "memory.h"
diff --git a/src/util/authhelper.h b/src/util/virauth.h
similarity index 87%
rename from src/util/authhelper.h
rename to src/util/virauth.h
index ca45d16..2c8d80f 100644
--- a/src/util/authhelper.h
+++ b/src/util/virauth.h
@@ -1,6 +1,5 @@
-
/*
- * authhelper.h: authentication related utility functions
+ * virauth.h: authentication related utility functions
*
* Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com>
*
@@ -20,8 +19,8 @@
*
*/
-#ifndef __VIR_AUTHHELPER_H__
-# define __VIR_AUTHHELPER_H__
+#ifndef __VIR_AUTH_H__
+# define __VIR_AUTH_H__
# include "internal.h"
@@ -30,4 +29,4 @@ char *virRequestUsername(virConnectAuthPtr auth, const char
*defaultUsername,
char *virRequestPassword(virConnectAuthPtr auth, const char *username,
const char *hostname);
-#endif /* __VIR_AUTHHELPER_H__ */
+#endif /* __VIR_AUTH_H__ */
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 298db12..8d261ef 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -31,7 +31,7 @@
#include "domain_conf.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "authhelper.h"
+#include "virauth.h"
#include "util.h"
#include "uuid.h"
#include "memory.h"
--
1.7.7.6