[pacman-dev] [PATCH] Fix some whitespace issues

Allan McRae allan at archlinux.org
Wed Jul 7 05:23:10 EDT 2010


The combination of tabs and spaces is annoying in any editor that
does not use a tab width of 2 spaces.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 lib/libalpm/be_package.c |    2 +-
 lib/libalpm/conflict.c   |    2 +-
 lib/libalpm/package.h    |    6 +++---
 src/pacman/util.c        |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 7b77ae6..3d8c4e3 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -230,7 +230,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
 		goto pkg_invalid;
 	}
 
-  archive_read_finish(archive);
+	archive_read_finish(archive);
 
 	/* internal fields for package struct */
 	newpkg->origin = PKG_FROM_FILE;
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index 236ec1d..694c38d 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -321,7 +321,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
  */
 static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
                     pmfileconflicttype_t type, const char *filestr,
-										const char* name1, const char* name2)
+                    const char* name1, const char* name2)
 {
 	pmfileconflict_t *conflict;
 	MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index c894644..14f81f9 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -67,10 +67,10 @@ struct __pmpkg_t {
 	/* internal */
 	pmpkgfrom_t origin;
 	/* Replaced 'void *data' with this union as follows:
-  origin == PKG_FROM_CACHE, use pkg->origin_data.db
-  origin == PKG_FROM_FILE, use pkg->origin_data.file
+	origin == PKG_FROM_CACHE, use pkg->origin_data.db
+	origin == PKG_FROM_FILE, use pkg->origin_data.file
 	*/
-  union {
+	union {
 		pmdb_t *db;
 		char *file;
 	} origin_data;
diff --git a/src/pacman/util.c b/src/pacman/util.c
index de1b162..f2cb67f 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -823,7 +823,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar
 
 #if defined(PACMAN_DEBUG)
 	/* If debug is on, we'll timestamp the output */
-  if(config->logmask & PM_LOG_DEBUG) {
+	if(config->logmask & PM_LOG_DEBUG) {
 		time_t t;
 		struct tm *tmp;
 		char timestr[10] = {0};
-- 
1.7.1.1






More information about the pacman-dev mailing list