Remove unnecessary header file, move one macro to util.c

Signed-off-by: Dan McGee <dan@archlinux.org>

lib/libalpm/Makefile.am

@@ -28,7 +28,7 @@ libalpm_la_SOURCES = \
 	delta.h delta.c \
 	deps.h deps.c \
 	dload.h dload.c \
-	error.h error.c \
+	error.c \
 	graph.h \
 	group.h group.c \
 	handle.h handle.c \

lib/libalpm/add.c

@@ -37,7 +37,6 @@
 #include "alpm_list.h"
 #include "trans.h"
 #include "util.h"
-#include "error.h"
 #include "cache.h"
 #include "log.h"
 #include "backup.h"

lib/libalpm/alpm.c

@@ -25,7 +25,6 @@
 /* libalpm */
 #include "alpm.h"
 #include "alpm_list.h"
-#include "error.h"
 #include "handle.h"
 #include "util.h"
 

lib/libalpm/be_files.c

@@ -39,7 +39,6 @@
 #include "log.h"
 #include "util.h"
 #include "alpm.h"
-#include "error.h"
 #include "handle.h"
 #include "package.h"
 #include "delta.h"

lib/libalpm/cache.c

@@ -31,7 +31,6 @@
 #include "log.h"
 #include "alpm.h"
 #include "util.h"
-#include "error.h"
 #include "package.h"
 #include "group.h"
 #include "db.h"

lib/libalpm/conflict.c

@@ -36,7 +36,6 @@
 #include "handle.h"
 #include "trans.h"
 #include "util.h"
-#include "error.h"
 #include "log.h"
 #include "cache.h"
 #include "deps.h"

lib/libalpm/db.c

@@ -40,7 +40,6 @@
 #include "alpm_list.h"
 #include "log.h"
 #include "util.h"
-#include "error.h"
 #include "dload.h"
 #include "handle.h"
 #include "cache.h"

lib/libalpm/delta.c

@@ -24,7 +24,6 @@
 
 /* libalpm */
 #include "delta.h"
-#include "error.h"
 #include "util.h"
 #include "log.h"
 #include "alpm_list.h"

lib/libalpm/deps.c

@@ -30,7 +30,6 @@
 #include "alpm_list.h"
 #include "util.h"
 #include "log.h"
-#include "error.h"
 #include "graph.h"
 #include "package.h"
 #include "db.h"

lib/libalpm/dload.c

@@ -32,7 +32,6 @@
 #include "alpm.h"
 #include "log.h"
 #include "util.h"
-#include "error.h"
 #include "handle.h"
 
 /* Build a 'struct url' from an url. */

lib/libalpm/error.c

@@ -22,7 +22,6 @@
 #include <download.h> /* downloadLastErrString */
 
 /* libalpm */
-#include "error.h"
 #include "util.h"
 #include "alpm.h"
 

lib/libalpm/error.h

@@ -1,28 +0,0 @@
-/*
- *  error.h
- *
- *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ALPM_ERROR_H
-#define _ALPM_ERROR_H
-
-#define RET_ERR(err, ret) do { pm_errno = (err); \
-	_alpm_log(PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerrorlast()); \
-	return(ret); } while(0)
-
-#endif /* _ALPM_ERROR_H */
-
-/* vim: set ts=2 sw=2 noet: */

lib/libalpm/group.c

@@ -27,7 +27,6 @@
 #include "group.h"
 #include "alpm_list.h"
 #include "util.h"
-#include "error.h"
 #include "log.h"
 #include "alpm.h"
 

lib/libalpm/handle.c

@@ -36,7 +36,6 @@
 #include "alpm_list.h"
 #include "util.h"
 #include "log.h"
-#include "error.h"
 #include "trans.h"
 #include "alpm.h"
 

lib/libalpm/log.c

@@ -30,7 +30,6 @@
 #include "log.h"
 #include "handle.h"
 #include "util.h"
-#include "error.h"
 #include "alpm.h"
 
 /** \addtogroup alpm_log Logging Functions

lib/libalpm/package.c

@@ -42,7 +42,6 @@
 #include "alpm_list.h"
 #include "log.h"
 #include "util.h"
-#include "error.h"
 #include "db.h"
 #include "cache.h"
 #include "delta.h"

lib/libalpm/remove.c

@@ -37,7 +37,6 @@
 #include "alpm_list.h"
 #include "trans.h"
 #include "util.h"
-#include "error.h"
 #include "log.h"
 #include "backup.h"
 #include "package.h"

lib/libalpm/sync.c

@@ -34,7 +34,6 @@
 #include "sync.h"
 #include "alpm_list.h"
 #include "log.h"
-#include "error.h"
 #include "package.h"
 #include "db.h"
 #include "cache.h"

lib/libalpm/trans.c

@@ -35,7 +35,6 @@
 /* libalpm */
 #include "trans.h"
 #include "alpm_list.h"
-#include "error.h"
 #include "package.h"
 #include "util.h"
 #include "log.h"

lib/libalpm/util.c

@@ -43,7 +43,6 @@
 /* libalpm */
 #include "util.h"
 #include "log.h"
-#include "error.h"
 #include "package.h"
 #include "alpm.h"
 #include "alpm_list.h"

lib/libalpm/util.h

@@ -51,6 +51,10 @@
 
 #define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0)
 
+#define RET_ERR(err, ret) do { pm_errno = (err); \
+	_alpm_log(PM_LOG_DEBUG, "returning error %d from %s : %s\n", err, __func__, alpm_strerrorlast()); \
+	return(ret); } while(0)
+
 int _alpm_makepath(const char *path);
 int _alpm_makepath_mode(const char *path, mode_t mode);
 int _alpm_copyfile(const char *src, const char *dest);