summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2013-10-16 18:29:13 +0200
committerMichael Schroeder <mls@suse.de>2013-10-16 18:29:13 +0200
commit9c424c737f26ec5af4257aed1f9d92fbe2862369 (patch)
tree4b212693d29344ff08d4817a4e3a695c5a8dea4e
parent2581c2d378058f1a362b3106dbd567e6d23fa232 (diff)
downloadlibsolv-9c424c737f26ec5af4257aed1f9d92fbe2862369.tar.gz
libsolv-9c424c737f26ec5af4257aed1f9d92fbe2862369.tar.bz2
libsolv-9c424c737f26ec5af4257aed1f9d92fbe2862369.zip
remove trailing whitespace
-rw-r--r--ext/repo_arch.c2
-rw-r--r--ext/repo_cudf.c4
-rw-r--r--ext/repo_helix.c28
-rw-r--r--ext/repo_pubkey.c8
-rw-r--r--ext/repo_rpmdb.c4
-rw-r--r--ext/repo_susetags.c4
-rw-r--r--ext/repo_zyppdb.c2
-rw-r--r--ext/solv_pgpvrfy.c2
-rw-r--r--ext/solv_xfopen.c6
-rw-r--r--ext/testcase.c26
10 files changed, 43 insertions, 43 deletions
diff --git a/ext/repo_arch.c b/ext/repo_arch.c
index e09d838..f6b9089 100644
--- a/ext/repo_arch.c
+++ b/ext/repo_arch.c
@@ -306,7 +306,7 @@ adddep(Repo *repo, Offset olddeps, char *line)
{
int flags = 0;
for (;; p++)
- {
+ {
if (*p == '<')
flags |= REL_LT;
else if (*p == '=')
diff --git a/ext/repo_cudf.c b/ext/repo_cudf.c
index d62ab38..316887b 100644
--- a/ext/repo_cudf.c
+++ b/ext/repo_cudf.c
@@ -157,7 +157,7 @@ finishpackage(Pool *pool, Solvable *s, int keep, Queue *job)
if (!s->evr)
s->evr = ID_EMPTY;
sid = pool_rel2id(pool, s->name, s->evr, REL_EQ, 1);
- s->provides = repo_addid_dep(s->repo, s->provides, sid, 0);
+ s->provides = repo_addid_dep(s->repo, s->provides, sid, 0);
if (!job || !pool->installed || s->repo != pool->installed)
return;
if (keep == KEEP_VERSION)
@@ -195,7 +195,7 @@ repo_add_cudf(Repo *repo, Repo *installedrepo, FILE *fp, Queue *job, int flags)
bufa = 4096;
bufl = 0;
s = 0;
-
+
while (fgets(buf + bufl, bufa - bufl, fp) > 0)
{
bufl += strlen(buf + bufl);
diff --git a/ext/repo_helix.c b/ext/repo_helix.c
index d2e50e8..b94bbcf 100644
--- a/ext/repo_helix.c
+++ b/ext/repo_helix.c
@@ -7,10 +7,10 @@
/*
* repo_helix.c
- *
+ *
* Parse 'helix' XML representation
* and create 'repo'
- *
+ *
* A bit of history: "Helix Code" was the name of the company that
* wrote Red Carpet. The company was later renamed to Ximian.
* The Red Carpet solver was merged into the ZYPP project, the
@@ -200,7 +200,7 @@ evr2id(Pool *pool, Parsedata *pd, const char *e, const char *v, const char *r)
if (v2 > v && *v2 == ':')
e = "0";
}
-
+
/* compute length of Id string */
l = 1; /* for the \0 */
if (e)
@@ -384,7 +384,7 @@ adddep(Pool *pool, Parsedata *pd, unsigned int olddeps, const char **atts, Id ma
/*
* XML callback
* <name>
- *
+ *
*/
static void XMLCALL
@@ -424,7 +424,7 @@ startElement(void *userData, const char *name, const char **atts)
#endif
return;
}
-
+
/* set new state */
pd->state = sw->to;
@@ -543,7 +543,7 @@ static const char *findKernelFlavor(Parsedata *pd, Solvable *s)
{
Pool *pool = pd->pool;
Id pid, *pidp;
-
+
if (s->provides)
{
pidp = pd->repo->idarraydata + s->provides;
@@ -551,7 +551,7 @@ static const char *findKernelFlavor(Parsedata *pd, Solvable *s)
{
Reldep *prd;
const char *depname;
-
+
if (!ISRELDEP(pid))
continue; /* wrong provides name */
prd = GETRELDEP(pool, pid);
@@ -571,8 +571,8 @@ static const char *findKernelFlavor(Parsedata *pd, Solvable *s)
if (!ISRELDEP(pid))
{
depname = pool_id2str(pool, pid);
- }
- else
+ }
+ else
{
Reldep *prd = GETRELDEP(pool, pid);
depname = pool_id2str(pool, prd->name);
@@ -589,7 +589,7 @@ static const char *findKernelFlavor(Parsedata *pd, Solvable *s)
/*
* XML callback
* </name>
- *
+ *
* create Solvable from collected data
*/
@@ -639,7 +639,7 @@ endElement(void *userData, const char *name)
/* see bugzilla bnc#190163 */
flavor = findKernelFlavor(pd, s);
- if (flavor)
+ if (flavor)
{
char *cflavor = solv_strdup(flavor); /* make pointer safe */
@@ -778,7 +778,7 @@ endElement(void *userData, const char *name)
/*
* XML callback
* character data
- *
+ *
*/
static void XMLCALL
@@ -814,7 +814,7 @@ characterData(void *userData, const XML_Char *s, int len)
/*
* read 'helix' type xml from fp
* add packages to pool/repo
- *
+ *
*/
int
@@ -831,7 +831,7 @@ repo_add_helix(Repo *repo, FILE *fp, int flags)
now = solv_timems(0);
data = repo_add_repodata(repo, flags);
-
+
/* prepare parsedata */
memset(&pd, 0, sizeof(pd));
for (i = 0, sw = stateswitches; sw->from != NUMSTATES; i++, sw++)
diff --git a/ext/repo_pubkey.c b/ext/repo_pubkey.c
index 17558ba..5b778a2 100644
--- a/ext/repo_pubkey.c
+++ b/ext/repo_pubkey.c
@@ -43,16 +43,16 @@
#include "solv_pgpvrfy.h"
#endif
-static void
+static void
setutf8string(Repodata *repodata, Id handle, Id tag, const char *str)
{
if (str[solv_validutf8(str)])
- {
+ {
char *ustr = solv_latin1toutf8(str); /* not utf8, assume latin1 */
repodata_set_str(repodata, handle, tag, ustr);
solv_free(ustr);
- }
- else
+ }
+ else
repodata_set_str(repodata, handle, tag, str);
}
diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
index ceeb7fb..82961ca 100644
--- a/ext/repo_rpmdb.c
+++ b/ext/repo_rpmdb.c
@@ -773,7 +773,7 @@ addchangelog(Repodata *data, Id handle, RpmHead *rpmhead)
solv_free(cn);
}
-static void
+static void
set_description_author(Repodata *data, Id handle, char *str)
{
char *aut, *p;
@@ -961,7 +961,7 @@ rpm2solv(Pool *pool, Repo *repo, Repodata *data, Solvable *s, RpmHead *rpmhead,
*/
struct rpmdbstate {
- Pool *pool;
+ Pool *pool;
char *rootdir;
RpmHead *rpmhead; /* header storage space */
diff --git a/ext/repo_susetags.c b/ext/repo_susetags.c
index 4f0232a..440e2d5 100644
--- a/ext/repo_susetags.c
+++ b/ext/repo_susetags.c
@@ -508,7 +508,7 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int
{
Repodata *sdata;
int i;
-
+
FOR_REPODATAS(repo, i, sdata)
{
int p;
@@ -538,7 +538,7 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int
}
}
}
-
+
/*
* read complete file
*
diff --git a/ext/repo_zyppdb.c b/ext/repo_zyppdb.c
index a4487c3..135a155 100644
--- a/ext/repo_zyppdb.c
+++ b/ext/repo_zyppdb.c
@@ -316,7 +316,7 @@ repo_add_zyppdb_products(Repo *repo, const char *dirpath, int flags)
DIR *dir;
FILE *fp;
Repodata *data;
-
+
data = repo_add_repodata(repo, flags);
memset(&pd, 0, sizeof(pd));
pd.repo = repo;
diff --git a/ext/solv_pgpvrfy.c b/ext/solv_pgpvrfy.c
index a62ca13..951856b 100644
--- a/ext/solv_pgpvrfy.c
+++ b/ext/solv_pgpvrfy.c
@@ -315,7 +315,7 @@ mpdsa(int pl, mp_t *p, int ql, mp_t *q, mp_t *g, mp_t *y, mp_t *r, mp_t *s, int
return 1;
}
-static int
+static int
mprsa(int nl, mp_t *n, int el, mp_t *e, mp_t *m, mp_t *c)
{
mp_t *tmp;
diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c
index 63fec23..b0421bf 100644
--- a/ext/solv_xfopen.c
+++ b/ext/solv_xfopen.c
@@ -35,14 +35,14 @@ FILE *fopencookie(void*, const char*, cookie_io_functions_t);
static FILE *cookieopen(void *cookie, const char *mode,
- ssize_t (*cread)(void *, char *, size_t),
- ssize_t (*cwrite)(void *, const char *, size_t),
+ ssize_t (*cread)(void *, char *, size_t),
+ ssize_t (*cwrite)(void *, const char *, size_t),
int (*cclose)(void *))
{
#ifdef HAVE_FUNOPEN
if (!cookie)
return 0;
- return funopen(cookie,
+ return funopen(cookie,
(int (*)(void *, char *, int))(*mode == 'r' ? cread : NULL), /* readfn */
(int (*)(void *, const char *, int))(*mode == 'w' ? cwrite : NULL), /* writefn */
(fpos_t (*)(void *, fpos_t, int))NULL, /* seekfn */
diff --git a/ext/testcase.c b/ext/testcase.c
index ab96184..923e4f1 100644
--- a/ext/testcase.c
+++ b/ext/testcase.c
@@ -294,11 +294,11 @@ testcase_str2dep(Pool *pool, char *s)
int flags;
if ((n = strchr(s, '|')) != 0)
- {
+ {
id = testcase_str2dep(pool, n + 1);
- *n = 0;
+ *n = 0;
id = pool_rel2id(pool, testcase_str2dep(pool, s), id, REL_OR, 1);
- *n = '|';
+ *n = '|';
return id;
}
while (*s == ' ' || *s == '\t')
@@ -338,7 +338,7 @@ testcase_str2dep(Pool *pool, char *s)
s += 2;
}
for (;;s++)
- {
+ {
if (*s == '<')
flags |= REL_LT;
else if (*s == '=')
@@ -402,8 +402,8 @@ testcase_solvid2str(Pool *pool, Id p)
n = pool_id2str(pool, s->name);
e = pool_id2str(pool, s->evr);
a = pool_id2str(pool, s->arch);
- str = pool_alloctmpspace(pool, strlen(n) + strlen(e) + strlen(a) + 3);
- sprintf(str, "%s-%s.%s", n, e, a);
+ str = pool_alloctmpspace(pool, strlen(n) + strlen(e) + strlen(a) + 3);
+ sprintf(str, "%s-%s.%s", n, e, a);
if (!s->repo)
return pool_tmpappend(pool, str, "@", 0);
if (s->repo->name)
@@ -1036,15 +1036,15 @@ finish_solvable(Pool *pool, Repodata *data, Solvable *s, char *filelist, int nfi
if (nfilelist)
{
int l;
- Id did;
- for (l = 0; l < nfilelist; l += strlen(filelist + l) + 1)
+ Id did;
+ for (l = 0; l < nfilelist; l += strlen(filelist + l) + 1)
{
char *p = strrchr(filelist + l, '/');
- if (!p)
+ if (!p)
continue;
- *p++ = 0;
+ *p++ = 0;
did = repodata_str2dir(data, filelist + l, 1);
- p[-1] = '/';
+ p[-1] = '/';
if (!did)
did = repodata_str2dir(data, "/", 1);
repodata_add_dirstr(data, s - pool->solvables, SOLVABLE_FILELIST, did, p);
@@ -1777,7 +1777,7 @@ read_inline_file(FILE *fp, char **bufp, char **bufpp, int *buflp)
char *result = solv_malloc(1024);
char *rp = result;
int resultl = 1024;
-
+
for (;;)
{
size_t rl;
@@ -1832,7 +1832,7 @@ read_file(FILE *fp)
char *result = solv_malloc(1024);
char *rp = result;
int resultl = 1024;
-
+
for (;;)
{
size_t rl;