bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some whitespace issues

Browse source 
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@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2010-07-07 16:58:51 +10:00 • committed by Dan McGee
parent d896527d21
commit 48589ccc64
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libalpm/be_package.c
View file

@ -230,7 +230,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
goto pkg_invalid; goto pkg_invalid;
} }
archive_read_finish(archive); archive_read_finish(archive);
/* internal fields for package struct */ /* internal fields for package struct */
newpkg->origin = PKG_FROM_FILE; newpkg->origin = PKG_FROM_FILE;

2
lib/libalpm/conflict.c
View file

@ -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, static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
pmfileconflicttype_t type, const char *filestr, pmfileconflicttype_t type, const char *filestr,
const char* name1, const char* name2) const char* name1, const char* name2)
{ {
pmfileconflict_t *conflict; pmfileconflict_t *conflict;
MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));

6
lib/libalpm/package.h
View file

@ -67,10 +67,10 @@ struct __pmpkg_t {
/* internal */ /* internal */
pmpkgfrom_t origin; pmpkgfrom_t origin;
/* Replaced 'void *data' with this union as follows: /* Replaced 'void *data' with this union as follows:
origin == PKG_FROM_CACHE, use pkg->origin_data.db origin == PKG_FROM_CACHE, use pkg->origin_data.db
origin == PKG_FROM_FILE, use pkg->origin_data.file origin == PKG_FROM_FILE, use pkg->origin_data.file
*/ */
union { union {
pmdb_t *db; pmdb_t *db;
char *file; char *file;
} origin_data; } origin_data;

2
src/pacman/util.c
View file

@ -823,7 +823,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar
#if defined(PACMAN_DEBUG) #if defined(PACMAN_DEBUG)
/* If debug is on, we'll timestamp the output */ /* If debug is on, we'll timestamp the output */
if(config->logmask & PM_LOG_DEBUG) { if(config->logmask & PM_LOG_DEBUG) {
time_t t; time_t t;
struct tm *tmp; struct tm *tmp;
char timestr[10] = {0}; char timestr[10] = {0};