summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2013-10-16 18:29:42 +0200
committerMichael Schroeder <mls@suse.de>2013-10-16 18:33:01 +0200
commit347e247833438d572c2cfea246c01ea439b72363 (patch)
tree965113ed471bc9f2f33d869262d2ffcbf12a86b3
parent9c424c737f26ec5af4257aed1f9d92fbe2862369 (diff)
downloadlibsolv-347e247833438d572c2cfea246c01ea439b72363.tar.gz
libsolv-347e247833438d572c2cfea246c01ea439b72363.tar.bz2
libsolv-347e247833438d572c2cfea246c01ea439b72363.zip
remove trailing whitespace
-rw-r--r--bindings/solv.i20
-rw-r--r--examples/solv.c2
-rw-r--r--src/dataiterator.h10
-rw-r--r--src/evr.h2
-rw-r--r--src/hash.h4
-rw-r--r--src/pool.h4
-rw-r--r--src/poolid.h2
-rw-r--r--src/poolid_private.h2
-rw-r--r--src/pooltypes.h2
-rw-r--r--src/queue.h2
-rw-r--r--src/repo.h8
-rw-r--r--src/repodata.h6
-rw-r--r--src/selection.h2
-rw-r--r--src/sha2.h4
-rw-r--r--src/solvable.h4
-rw-r--r--src/solver.h16
-rw-r--r--src/transaction.h2
17 files changed, 46 insertions, 46 deletions
diff --git a/bindings/solv.i b/bindings/solv.i
index 1f9259b..3005929 100644
--- a/bindings/solv.i
+++ b/bindings/solv.i
@@ -190,15 +190,15 @@
# work around a swig bug
%{
#undef SWIG_CALLXS
-#ifdef PERL_OBJECT
-# define SWIG_CALLXS(_name) TOPMARK=MARK-PL_stack_base;_name(cv,pPerl)
-#else
-# ifndef MULTIPLICITY
-# define SWIG_CALLXS(_name) TOPMARK=MARK-PL_stack_base;_name(cv)
-# else
-# define SWIG_CALLXS(_name) TOPMARK=MARK-PL_stack_base;_name(PERL_GET_THX, cv)
-# endif
-#endif
+#ifdef PERL_OBJECT
+# define SWIG_CALLXS(_name) TOPMARK=MARK-PL_stack_base;_name(cv,pPerl)
+#else
+# ifndef MULTIPLICITY
+# define SWIG_CALLXS(_name) TOPMARK=MARK-PL_stack_base;_name(cv)
+# else
+# define SWIG_CALLXS(_name) TOPMARK=MARK-PL_stack_base;_name(PERL_GET_THX, cv)
+# endif
+#endif
%}
@@ -360,7 +360,7 @@ SWIG_AsValDepId(VALUE obj, int *val) {
SWIG_AsValDepId(void *obj, int *val) {
#endif
static swig_type_info* desc = 0;
- void *vptr = 0;
+ void *vptr = 0;
int ecode;
if (!desc) desc = SWIG_TypeQuery("Dep *");
ecode = SWIG_AsVal_int(obj, val);
diff --git a/examples/solv.c b/examples/solv.c
index 3bb8b9c..a79b5b7 100644
--- a/examples/solv.c
+++ b/examples/solv.c
@@ -2802,7 +2802,7 @@ main(int argc, char **argv)
}
else if (!strcmp(argv[1], "--arch"))
{
- if (!strcmp(argv[2], "src") || !strcmp(argv[2], "nosrc"))
+ if (!strcmp(argv[2], "src") || !strcmp(argv[2], "nosrc"))
archfilter_src = 1;
queue_push2(&archfilter, SOLVER_SOLVABLE_PROVIDES, pool_rel2id(pool, 0, pool_str2id(pool, argv[2], 1), REL_ARCH, 1));
argc -= 2;
diff --git a/src/dataiterator.h b/src/dataiterator.h
index df10349..3133686 100644
--- a/src/dataiterator.h
+++ b/src/dataiterator.h
@@ -7,7 +7,7 @@
/*
* dataiterator.h
- *
+ *
*/
#ifndef LIBSOLV_DATAITERATOR_H
@@ -83,12 +83,12 @@ int datamatcher_checkbasename(Datamatcher *ma, const char *str);
/*
* Dataiterator
- *
+ *
* Iterator like interface to 'search' functionality
- *
+ *
* Dataiterator is per-pool, additional filters can be applied
* to limit the search domain. See dataiterator_init below.
- *
+ *
* Use these like:
* Dataiterator di;
* dataiterator_init(&di, repo->pool, repo, 0, 0, "bla", SEARCH_SUBSTRING);
@@ -151,7 +151,7 @@ typedef struct _Dataiterator
/*
* Initialize dataiterator
- *
+ *
* di: Pointer to Dataiterator to be initialized
* pool: Search domain for the iterator
* repo: if non-null, limit search to this repo
diff --git a/src/evr.h b/src/evr.h
index 787b6bb..d18cc52 100644
--- a/src/evr.h
+++ b/src/evr.h
@@ -7,7 +7,7 @@
/*
* evr.h
- *
+ *
*/
#ifndef LIBSOLV_EVR_H
diff --git a/src/hash.h b/src/hash.h
index 1d3222b..1290afa 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -74,9 +74,9 @@ relhash(Id name, Id evr, int flags)
/* compute bitmask for value
* returns smallest (2^n-1) > 2 * num
- *
+ *
* used for Hashtable 'modulo' operation
- */
+ */
static inline Hashval
mkmask(unsigned int num)
{
diff --git a/src/pool.h b/src/pool.h
index edcca56..2227bc2 100644
--- a/src/pool.h
+++ b/src/pool.h
@@ -7,7 +7,7 @@
/*
* pool.h
- *
+ *
*/
#ifndef LIBSOLV_POOL_H
@@ -49,7 +49,7 @@ typedef struct _Datapos {
Id solvid;
Id repodataid;
Id schema;
- Id dp;
+ Id dp;
} Datapos;
struct _Pool_tmpspace {
diff --git a/src/poolid.h b/src/poolid.h
index a232290..2363595 100644
--- a/src/poolid.h
+++ b/src/poolid.h
@@ -7,7 +7,7 @@
/*
* poolid.h
- *
+ *
*/
#ifndef LIBSOLV_POOLID_H
diff --git a/src/poolid_private.h b/src/poolid_private.h
index 2e93d74..43ff50d 100644
--- a/src/poolid_private.h
+++ b/src/poolid_private.h
@@ -7,7 +7,7 @@
/*
* poolid_private.h
- *
+ *
*/
#ifndef LIBSOLV_POOLID_PRIVATE_H
diff --git a/src/pooltypes.h b/src/pooltypes.h
index 9dce9b7..64a3b87 100644
--- a/src/pooltypes.h
+++ b/src/pooltypes.h
@@ -7,7 +7,7 @@
/*
* pooltypes.h
- *
+ *
*/
#ifndef LIBSOLV_POOLTYPES_H
diff --git a/src/queue.h b/src/queue.h
index 16f2cc6..4785e67 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -7,7 +7,7 @@
/*
* queue.h
- *
+ *
*/
#ifndef LIBSOLV_QUEUE_H
diff --git a/src/repo.h b/src/repo.h
index 21f4628..106f2a5 100644
--- a/src/repo.h
+++ b/src/repo.h
@@ -7,7 +7,7 @@
/*
* repo.h
- *
+ *
*/
#ifndef LIBSOLV_REPO_H
@@ -92,7 +92,7 @@ static inline int pool_disabled_solvable(const Pool *pool, Solvable *s)
if (s->repo && s->repo->disabled)
return 1;
if (pool->considered)
- {
+ {
Id id = s - pool->solvables;
if (!MAPTST(pool->considered, id))
return 1;
@@ -109,7 +109,7 @@ static inline int pool_installable(const Pool *pool, Solvable *s)
if (pool->id2arch && (s->arch > pool->lastarch || !pool->id2arch[s->arch]))
return 0;
if (pool->considered)
- {
+ {
Id id = s - pool->solvables;
if (!MAPTST(pool->considered, id))
return 0;
@@ -162,7 +162,7 @@ void repo_add_deparray(Repo *repo, Id p, Id keyname, Id dep, Id marker);
void repo_set_idarray(Repo *repo, Id p, Id keyname, Queue *q);
void repo_set_deparray(Repo *repo, Id p, Id keyname, Queue *q, Id marker);
void repo_unset(Repo *repo, Id p, Id keyname);
-
+
void repo_internalize(Repo *repo);
void repo_disable_paging(Repo *repo);
diff --git a/src/repodata.h b/src/repodata.h
index bdd4b4a..f38ed4a 100644
--- a/src/repodata.h
+++ b/src/repodata.h
@@ -7,13 +7,13 @@
/*
* repodata.h
- *
+ *
*/
#ifndef LIBSOLV_REPODATA_H
#define LIBSOLV_REPODATA_H
-#include <stdio.h>
+#include <stdio.h>
#include "pooltypes.h"
#include "pool.h"
@@ -271,7 +271,7 @@ void repodata_add_flexarray(Repodata *data, Id solvid, Id keyname, Id ghandle);
void repodata_unset(Repodata *data, Id solvid, Id keyname);
void repodata_unset_uninternalized(Repodata *data, Id solvid, Id keyname);
-/*
+/*
merge/swap attributes from one solvable to another
works only if the data is not yet internalized
*/
diff --git a/src/selection.h b/src/selection.h
index 1908476..fc2b15d 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -7,7 +7,7 @@
/*
* selection.h
- *
+ *
*/
#ifndef LIBSOLV_SELECTION_H
diff --git a/src/sha2.h b/src/sha2.h
index ca17e92..220af32 100644
--- a/src/sha2.h
+++ b/src/sha2.h
@@ -1,7 +1,7 @@
/*
* FILE: sha2.h
* AUTHOR: Aaron D. Gifford <me@aarongifford.com>
- *
+ *
* Copyright (c) 2000-2001, Aaron D. Gifford
* All rights reserved.
*
@@ -16,7 +16,7 @@
* 3. Neither the name of the copyright holder nor the names of contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/src/solvable.h b/src/solvable.h
index 0407997..85d20c4 100644
--- a/src/solvable.h
+++ b/src/solvable.h
@@ -7,7 +7,7 @@
/*
* solvable.h
- *
+ *
* A solvable represents an object with name-epoch:version-release.arch
* and dependencies
*/
@@ -77,7 +77,7 @@ void solvable_set_deparray(Solvable *s, Id keyname, Queue *q, Id marker);
void solvable_unset(Solvable *s, Id keyname);
int solvable_identical(Solvable *s1, Solvable *s2);
-Id solvable_selfprovidedep(Solvable *s);
+Id solvable_selfprovidedep(Solvable *s);
int solvable_matchesdep(Solvable *s, Id keyname, Id dep, int marker);
#ifdef __cplusplus
diff --git a/src/solver.h b/src/solver.h
index 53c1936..a0a101d 100644
--- a/src/solver.h
+++ b/src/solver.h
@@ -37,7 +37,7 @@ struct _Solver {
#ifdef LIBSOLV_INTERNAL
Repo *installed; /* copy of pool->installed */
-
+
/* list of rules, ordered
* rpm rules first, then features, updates, jobs, learnt
* see start/end offsets below
@@ -48,15 +48,15 @@ struct _Solver {
Queue ruleassertions; /* Queue of all assertion rules */
/* start/end offset for rule 'areas' */
-
+
Id rpmrules_end; /* [Offset] rpm rules end */
-
+
Id featurerules; /* feature rules start/end */
Id featurerules_end;
-
+
Id updaterules; /* policy rules, e.g. keep packages installed or update. All literals > 0 */
Id updaterules_end;
-
+
Id jobrules; /* user rules */
Id jobrules_end;
@@ -65,7 +65,7 @@ struct _Solver {
Id duprules; /* dist upgrade rules */
Id duprules_end;
-
+
Id bestrules; /* rules from SOLVER_FORCEBEST */
Id bestrules_end;
Id *bestrules_pkg;
@@ -152,13 +152,13 @@ struct _Solver {
int dontinstallrecommended; /* true: do not install recommended packages */
int addalreadyrecommended; /* true: also install recommended packages that were already recommended by the installed packages */
int dontshowinstalledrecommended; /* true: do not show recommended packages that are already installed */
-
+
int noinfarchcheck; /* true: do not forbid inferior architectures */
int keepexplicitobsoletes; /* true: honor obsoletes during multiinstall */
int bestobeypolicy; /* true: stay in policy with the best rules */
int noautotarget; /* true: do not assume targeted for up/dup jobs that contain no installed solvable */
-
+
Map dupmap; /* dup these packages*/
int dupmap_all; /* dup all packages */
Map dupinvolvedmap; /* packages involved in dup process */
diff --git a/src/transaction.h b/src/transaction.h
index a6b0782..36b0c6f 100644
--- a/src/transaction.h
+++ b/src/transaction.h
@@ -116,7 +116,7 @@ void transaction_calc_duchanges(Transaction *trans, struct _DUChanges *mps, int
/* order a transaction */
extern void transaction_order(Transaction *trans, int flags);
-/* roll your own order funcion:
+/* roll your own order funcion:
* add pkgs free for installation to queue choices after chosen was
* installed. start with chosen = 0
* needs an ordered transaction created with SOLVER_TRANSACTION_KEEP_ORDERDATA */