summaryrefslogtreecommitdiff
path: root/dpkg-split
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2010-11-01 08:18:28 +0100
committerGuillem Jover <guillem@debian.org>2010-11-19 05:21:14 +0100
commitc6ea15b9850f26ea3b5a13667396c89e00aa9890 (patch)
tree9da3c56846f1e9f0e75d3ac619713c6467af472a /dpkg-split
parent7ee4f4f2ef5ca3d9fa1426ac93f78ead2280bc36 (diff)
downloaddpkg-c6ea15b9850f26ea3b5a13667396c89e00aa9890.tar.gz
Cleanup white spaces
Remove trailing spaces. Remove blank lines not separating different code blocks. Remove blank lines at the end of the file.
Diffstat (limited to 'dpkg-split')
-rw-r--r--dpkg-split/info.c14
-rw-r--r--dpkg-split/join.c9
-rw-r--r--dpkg-split/main.c2
-rw-r--r--dpkg-split/queue.c2
4 files changed, 13 insertions, 14 deletions
diff --git a/dpkg-split/info.c b/dpkg-split/info.c
index 527f1d917..57a55617e 100644
--- a/dpkg-split/info.c
+++ b/dpkg-split/info.c
@@ -93,13 +93,13 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
struct ar_hdr arh;
int c;
struct stat stab;
-
+
if (fread(magicbuf, 1, sizeof(magicbuf), partfile) != sizeof(magicbuf)) {
if (ferror(partfile)) rerr(fn); else return NULL;
}
if (memcmp(magicbuf, DPKG_AR_MAGIC, sizeof(magicbuf)))
return NULL;
-
+
if (fread(&arh,1,sizeof(arh),partfile) != sizeof(arh)) rerreof(partfile,fn);
dpkg_ar_normalize_name(&arh);
@@ -143,7 +143,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
fn, _("archive total size"));
ir->maxpartlen = unsignedlong(nextline(&rip, fn, _("archive part offset")),
fn, _("archive part offset"));
-
+
partnums = nextline(&rip, fn, _("archive part numbers"));
slash= strchr(partnums,'/');
if (!slash)
@@ -193,13 +193,13 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
ir->headerlen = strlen(DPKG_AR_MAGIC) +
sizeof(arh) + thisilen + (thisilen & 1) + sizeof(arh);
-
+
return ir;
-}
+}
void mustgetpartinfo(const char *filename, struct partinfo *ri) {
FILE *part;
-
+
part= fopen(filename,"r");
if (!part) ohshite(_("cannot open archive part file `%.250s'"),filename);
if (!read_info(part,filename,ri))
@@ -241,7 +241,7 @@ void do_info(const char *const *argv) {
if (!*argv)
badusage(_("--%s requires one or more part file arguments"),
cipaction->olong);
-
+
while ((thisarg= *argv++)) {
part= fopen(thisarg,"r");
if (!part) ohshite(_("cannot open archive part file `%.250s'"),thisarg);
diff --git a/dpkg-split/join.c b/dpkg-split/join.c
index ff38e88d7..e6106ea37 100644
--- a/dpkg-split/join.c
+++ b/dpkg-split/join.c
@@ -46,7 +46,7 @@ void reassemble(struct partinfo **partlist, const char *outputfile) {
"Putting package %s together from %d parts: ",
partlist[0]->maxpartn),
partlist[0]->package,partlist[0]->maxpartn);
-
+
buffersize= partlist[0]->maxpartlen;
for (i=0; i<partlist[0]->maxpartn; i++)
if (partlist[0]->headerlen > buffersize) buffersize= partlist[0]->headerlen;
@@ -84,7 +84,7 @@ void reassemble(struct partinfo **partlist, const char *outputfile) {
void addtopartlist(struct partinfo **partlist,
struct partinfo *pi, struct partinfo *refi) {
int i;
-
+
if (strcmp(pi->package,refi->package) ||
strcmp(pi->version,refi->version) ||
strcmp(pi->md5sum,refi->md5sum) ||
@@ -109,7 +109,7 @@ void do_join(const char *const *argv) {
struct partqueue *pq;
struct partinfo *refi, *pi, **partlist;
unsigned int i;
-
+
assert(!queue);
if (!*argv)
badusage(_("--%s requires one or more part file arguments"),
@@ -118,8 +118,7 @@ void do_join(const char *const *argv) {
pq= nfmalloc(sizeof(struct partqueue));
mustgetpartinfo(thisarg,&pq->info);
-
-
+
pq->nextinqueue= queue;
queue= pq;
}
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index 9901263be..c56367e00 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -174,7 +174,7 @@ int main(int argc, const char *const *argv) {
action(argv);
m_output(stderr, _("<standard error>"));
-
+
standard_shutdown();
exit(0);
}
diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c
index 97865daf6..c7e042f11 100644
--- a/dpkg-split/queue.c
+++ b/dpkg-split/queue.c
@@ -238,7 +238,7 @@ void do_queue(const char *const *argv) {
}
}
if (!*head) putchar('\n');
-
+
head= N_("Packages not yet reassembled:\n");
for (pq= queue; pq; pq= pq->nextinqueue) {
if (!pq->info.md5sum) continue;