diff options
Diffstat (limited to 'lib')
58 files changed, 36 insertions, 86 deletions
diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am index d71b6ead9..cb3224a32 100644 --- a/lib/compat/Makefile.am +++ b/lib/compat/Makefile.am @@ -55,4 +55,3 @@ endif if !HAVE_UNSETENV libcompat_a_SOURCES += unsetenv.c endif - diff --git a/lib/compat/alphasort.c b/lib/compat/alphasort.c index c30c632b5..f307ef20a 100644 --- a/lib/compat/alphasort.c +++ b/lib/compat/alphasort.c @@ -31,4 +31,3 @@ alphasort(const void *a, const void *b) } #endif - diff --git a/lib/compat/compat.h b/lib/compat/compat.h index 80de53ebd..4fe776105 100644 --- a/lib/compat/compat.h +++ b/lib/compat/compat.h @@ -92,4 +92,3 @@ int unsetenv(const char *x); #endif #endif /* COMPAT_H */ - diff --git a/lib/compat/scandir.c b/lib/compat/scandir.c index 6eac2512c..4faece49e 100644 --- a/lib/compat/scandir.c +++ b/lib/compat/scandir.c @@ -98,4 +98,3 @@ scandir(const char *dir, struct dirent ***namelist, return used; } #endif - diff --git a/lib/compat/snprintf.c b/lib/compat/snprintf.c index b28932cb1..5dd6705e6 100644 --- a/lib/compat/snprintf.c +++ b/lib/compat/snprintf.c @@ -38,4 +38,3 @@ snprintf(char *str, size_t n, char const *fmt, ...) return i; } #endif - diff --git a/lib/compat/strerror.c b/lib/compat/strerror.c index aec27a196..ea8f1d7ec 100644 --- a/lib/compat/strerror.c +++ b/lib/compat/strerror.c @@ -41,4 +41,3 @@ strerror(int e) return buf; } #endif - diff --git a/lib/compat/strsignal.c b/lib/compat/strsignal.c index ebd36d946..b4e3dbef6 100644 --- a/lib/compat/strsignal.c +++ b/lib/compat/strsignal.c @@ -70,4 +70,3 @@ strsignal(int s) return buf; } #endif - diff --git a/lib/compat/unsetenv.c b/lib/compat/unsetenv.c index 6c191d32d..7551629e1 100644 --- a/lib/compat/unsetenv.c +++ b/lib/compat/unsetenv.c @@ -37,4 +37,3 @@ unsetenv(const char *p) return putenv(q); } #endif - diff --git a/lib/compat/vsnprintf.c b/lib/compat/vsnprintf.c index 85496e37c..6e08cefa7 100644 --- a/lib/compat/vsnprintf.c +++ b/lib/compat/vsnprintf.c @@ -69,4 +69,3 @@ vsnprintf(char *buf, size_t maxsize, const char *fmt, va_list args) return total; } #endif - diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c index 40af5be5d..31c2b3cc8 100644 --- a/lib/dpkg/buffer.c +++ b/lib/dpkg/buffer.c @@ -246,4 +246,3 @@ buffer_copy(struct buffer_data *read_data, struct buffer_data *write_data, return totalread; } - diff --git a/lib/dpkg/cleanup.c b/lib/dpkg/cleanup.c index b94a5045c..98bf1004f 100644 --- a/lib/dpkg/cleanup.c +++ b/lib/dpkg/cleanup.c @@ -59,4 +59,3 @@ cu_closefd(int argc, void **argv) close(ip); } - diff --git a/lib/dpkg/command.c b/lib/dpkg/command.c index f98a0eeba..a16d5d607 100644 --- a/lib/dpkg/command.c +++ b/lib/dpkg/command.c @@ -181,4 +181,3 @@ command_exec(struct command *cmd) execvp(cmd->filename, (char * const *)cmd->argv); ohshite(_("unable to execute %s (%s)"), cmd->name, cmd->filename); } - diff --git a/lib/dpkg/command.h b/lib/dpkg/command.h index 15e2d5873..25e509f17 100644 --- a/lib/dpkg/command.h +++ b/lib/dpkg/command.h @@ -51,4 +51,3 @@ void command_exec(struct command *cmd) DPKG_ATTR_NORET; DPKG_END_DECLS #endif /* LIBDPKG_COMMAND_H */ - diff --git a/lib/dpkg/database.c b/lib/dpkg/database.c index c1009f932..e80e61dc7 100644 --- a/lib/dpkg/database.c +++ b/lib/dpkg/database.c @@ -134,7 +134,7 @@ pkg_db_find(const char *inname) p= name; while(*p) { *p= tolower(*p); p++; } - + pointerp= bins + (hash(name) % (BINS)); while (*pointerp && strcasecmp((*pointerp)->name,name)) pointerp= &(*pointerp)->next; diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index b51816133..81be02d8f 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -83,7 +83,6 @@ static void cleanupdates(void) { if (cdn == -1) ohshite(_("cannot scan updates directory `%.255s'"),updatefnbuf); if (cdn) { - for (i=0; i<cdn; i++) { strcpy(updatefnrest, cdlist[i]->d_name); parsedb(updatefnbuf, pdb_lax_parser | pdb_weakclassification, @@ -93,7 +92,7 @@ static void cleanupdates(void) { if (cstatus >= msdbrw_write) { writedb(statusfile,0,1); - + for (i=0; i<cdn; i++) { strcpy(updatefnrest, cdlist[i]->d_name); if (unlink(updatefnbuf)) @@ -103,7 +102,6 @@ static void cleanupdates(void) { dir_sync_path(updatesdir); } - } free(cdlist); @@ -112,9 +110,9 @@ static void cleanupdates(void) { static void createimptmp(void) { int i; - + onerr_abort++; - + importanttmp= fopen(importanttmpfile,"w"); if (!importanttmp) ohshite(_("unable to create `%.255s'"), importanttmpfile); @@ -209,7 +207,7 @@ enum modstatdb_rw modstatdb_init(const char *admindir, enum modstatdb_rw readwritereq) { const struct fni *fnip; - + for (fnip=fnis; fnip->suffix; fnip++) { free(*fnip->store); *fnip->store = m_malloc(strlen(admindir) + strlen(fnip->suffix) + 2); @@ -273,7 +271,7 @@ void modstatdb_checkpoint(void) { assert(cstatus >= msdbrw_write); writedb(statusfile,0,1); - + for (i=0; i<nextupdate; i++) { sprintf(updatefnrest, IMPORTANTFMT, i); /* Have we made a real mess? */ @@ -415,4 +413,3 @@ const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile) { varbufaddc(&vb,0); return vb.buf; } - diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h index 62f1a7781..43259aa1c 100644 --- a/lib/dpkg/dpkg-db.h +++ b/lib/dpkg/dpkg-db.h @@ -36,7 +36,7 @@ struct versionrevision { unsigned long epoch; const char *version; const char *revision; -}; +}; enum deptype { dep_suggests, @@ -202,6 +202,7 @@ enum modstatdb_rw { msdbrw_readonly/*s*/, msdbrw_needsuperuserlockonly/*s*/, msdbrw_writeifposs, msdbrw_write/*s*/, msdbrw_needsuperuser, + /* Now some optional flags: */ msdbrw_flagsmask= ~077, /* Flags start at 0100. */ diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index 03c1f6b4b..3c16fd420 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -116,7 +116,7 @@ void w_filecharf(struct varbuf *vb, const struct pkginfo *pigp, const struct pkginfoperfile *pifp, enum fwriteflags flags, const struct fieldinfo *fip) { struct filedetails *fdp; - + if (pifp != &pigp->available) return; fdp= pigp->files; if (!fdp || !FILEFFIELD(fdp,fip->integer,const char*)) return; @@ -146,7 +146,7 @@ void w_booleandefno(struct varbuf *vb, } if (!value) return; assert(value == true); - varbufaddstr(vb,fip->name); varbufaddstr(vb, ": yes\n"); + varbufaddstr(vb,fip->name); varbufaddstr(vb, ": yes\n"); } void w_priority(struct varbuf *vb, @@ -357,7 +357,7 @@ void writedb(const char *filename, bool available, bool mustsync) { static char writebuf[8192]; - + struct pkgiterator *it; struct pkginfo *pigp; struct pkginfoperfile *pifp; @@ -378,7 +378,7 @@ writedb(const char *filename, bool available, bool mustsync) umask(old_umask); if (!file) ohshite(_("failed to open '%s' for writing %s database"), filename, which); - + if (setvbuf(file,writebuf,_IOFBF,sizeof(writebuf))) ohshite(_("unable to set buffering on %s database file"), which); @@ -393,7 +393,7 @@ writedb(const char *filename, bool available, bool mustsync) if (fputs(vb.buf,file) < 0) ohshite(_("failed to write %s database record about '%.50s' to '%.250s'"), which, pigp->name, filename); - varbufreset(&vb); + varbufreset(&vb); } pkg_db_iter_free(it); varbuf_destroy(&vb); diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c index ad425da5e..8faea8f88 100644 --- a/lib/dpkg/ehandle.c +++ b/lib/dpkg/ehandle.c @@ -58,7 +58,7 @@ struct cleanup_entry { int cpmask, cpvalue; int argc; void *argv[1]; -}; +}; struct error_context { struct error_context *next; @@ -196,7 +196,7 @@ run_cleanups(struct error_context *econ, int flagsetin) volatile int i, flagset; if (econ->printerror) econ->printerror(errmsg,econ->contextstring); - + if (++preventrecurse > 3) { onerr_abort++; fprintf(stderr, _("%s: too many nested errors during error recovery!!\n"), @@ -262,7 +262,7 @@ pop_error_context(int flagset) void push_checkpoint(int mask, int value) { struct cleanup_entry *cep; int i; - + cep = malloc(sizeof(struct cleanup_entry) + sizeof(char *)); if (cep == NULL) { onerr_abort++; @@ -285,7 +285,7 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1, va_list args; onerr_abort++; - + cep = malloc(sizeof(struct cleanup_entry) + sizeof(char *) * (nargs + 1)); if (!cep) { if (nargs > array_count(emergency.args)) @@ -374,7 +374,7 @@ void ohshite(const char *fmt, ...) { va_end(args); snprintf(errmsgbuf,sizeof(errmsgbuf),"%s: %s",buf,strerror(e)); - errmsg= errmsgbuf; + errmsg= errmsgbuf; run_error_handler(); } @@ -417,5 +417,3 @@ do_internerr(const char *file, int line, const char *fmt, ...) abort(); } - - diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index 74e085360..89f055580 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -161,7 +161,7 @@ void f_status(struct pkginfo *pigp, struct pkginfoperfile *pifp, _("value for `status' field not allowed in this context")); if (ps->flags & pdb_recordavailable) return; - + pigp->want = convert_string(ps, pigp, _("first (want) word in `status' field"), wantinfos, value, &ep, -1); @@ -178,7 +178,7 @@ void f_version(struct pkginfo *pigp, struct pkginfoperfile *pifp, const char *value, const struct fieldinfo *fip) { parse_db_version(ps, pigp, &pifp->version, value, _("error in Version string '%.250s'"), value); -} +} void f_revision(struct pkginfo *pigp, struct pkginfoperfile *pifp, struct parsedb_state *ps, @@ -194,7 +194,7 @@ void f_revision(struct pkginfo *pigp, struct pkginfoperfile *pifp, pifp->version.version= newversion; } pifp->version.revision= nfstrsave(value); -} +} void f_configversion(struct pkginfo *pigp, struct pkginfoperfile *pifp, struct parsedb_state *ps, @@ -221,7 +221,7 @@ static void conffvalue_lastword(const char *value, const char *from, struct pkginfo *pigp) { const char *lastspc; - + if (from <= value+1) goto malformed; for (lastspc= from-1; *lastspc != ' '; lastspc--); if (lastspc <= value+1 || lastspc >= endent-1) goto malformed; @@ -245,7 +245,7 @@ void f_conffiles(struct pkginfo *pigp, struct pkginfoperfile *pifp, const char *endent, *endfn, *hashstart; int c, namelen, hashlen, obsolete; char *newptr; - + lastp= &pifp->conffiles; while (*value) { c= *value++; @@ -542,4 +542,3 @@ f_trigaw(struct pkginfo *aw, struct pkginfoperfile *pifp, trig_enqueue_awaited_pend(pend); } } - diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index 424e9326b..874cbbf02 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -149,4 +149,3 @@ file_lock(int *lockfd, enum file_lock_flags flags, const char *filename, push_cleanup(file_unlock_cleanup, ~0, NULL, 0, 2, lockfd, desc); } - diff --git a/lib/dpkg/file.h b/lib/dpkg/file.h index 2ffa84ddc..5ea084999 100644 --- a/lib/dpkg/file.h +++ b/lib/dpkg/file.h @@ -51,4 +51,3 @@ void file_unlock(void); DPKG_END_DECLS #endif /* LIBDPKG_FILE_H */ - diff --git a/lib/dpkg/log.c b/lib/dpkg/log.c index 94c570948..8efb7bc41 100644 --- a/lib/dpkg/log.c +++ b/lib/dpkg/log.c @@ -103,4 +103,3 @@ statusfd_send(const char *fmt, ...) } } } - diff --git a/lib/dpkg/macros.h b/lib/dpkg/macros.h index a9f861267..642558cbd 100644 --- a/lib/dpkg/macros.h +++ b/lib/dpkg/macros.h @@ -84,4 +84,3 @@ #endif #endif /* LIBDPKG_MACROS_H */ - diff --git a/lib/dpkg/mlib.c b/lib/dpkg/mlib.c index f8e9c58a3..bd242f447 100644 --- a/lib/dpkg/mlib.c +++ b/lib/dpkg/mlib.c @@ -38,12 +38,12 @@ void *m_malloc(size_t amount) { unsigned short *r2, x; #endif void *r; - + onerr_abort++; r= malloc(amount); if (!r) ohshite(_("malloc failed (%ld bytes)"),(long)amount); onerr_abort--; - + #ifdef MDEBUG r2= r; x= (unsigned short)amount ^ 0xf000; while (amount >= 2) { *r2++= x; amount -= 2; } @@ -76,7 +76,7 @@ m_strdup(const char *str) void m_dup2(int oldfd, int newfd) { const char *const stdstrings[]= { "in", "out", "err" }; - + if (dup2(oldfd,newfd) == newfd) return; onerr_abort++; @@ -106,4 +106,3 @@ void setcloexec(int fd, const char* fn) { if (fcntl(fd, F_SETFD, (f|FD_CLOEXEC))==-1) ohshite(_("unable to set close-on-exec flag for %.250s"),fn); } - diff --git a/lib/dpkg/nfmalloc.c b/lib/dpkg/nfmalloc.c index 98a06ff75..e528ef05d 100644 --- a/lib/dpkg/nfmalloc.c +++ b/lib/dpkg/nfmalloc.c @@ -45,7 +45,7 @@ static void nfobstack_init(void) { dbobs_init = true; obstack_chunk_size(&db_obs) = CHUNK_SIZE; } - + void * nfmalloc(size_t size) { diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index cc65601bc..16793e467 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -250,9 +250,11 @@ int parsedb(const char *filename, enum parsedbflags flags, } if (EOF_mmap(dataptr, endptr) || c == '\n' || c == MSDOS_EOF_CHAR) break; } /* Loop per field. */ + if (pdone && donep) parse_error(&ps, &newpig, _("several package info entries found, only one allowed")); + parse_must_have_field(&ps, &newpig, newpig.name, "package name"); /* XXX: We need to check for status != stat_halfinstalled as while * unpacking a deselected package, it will not have yet all data in @@ -379,7 +381,6 @@ int parsedb(const char *filename, enum parsedbflags flags, /* ->othertrigaw_head is updated by trig_note_aw in *(pkg_db_find()) * rather than in newpig. */ } - } else if (!(flags & pdb_ignorefiles)) { pigp->files= newpig.files; } @@ -439,7 +440,7 @@ void copy_dependency_links(struct pkginfo *pkg, struct dependency *dyp; struct deppossi *dop; struct pkginfoperfile *addtopifp; - + /* Delete ‘backward’ (‘depended’) links from other packages to * dependencies listed in old version of this one. We do this by * going through all the dependencies in the old version of this @@ -458,6 +459,7 @@ void copy_dependency_links(struct pkginfo *pkg, dop->rev_next->rev_prev = dop->rev_prev; } } + /* Now fill in new ‘ed’ links from other packages to dependencies * listed in new version of this one, and set our uplinks correctly. */ for (dyp= newdepends; dyp; dyp= dyp->next) { @@ -471,6 +473,7 @@ void copy_dependency_links(struct pkginfo *pkg, addtopifp->depended= dop; } } + /* Finally, we fill in the new value. */ *updateme= newdepends; } diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c index c28db87e4..8f18367db 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c @@ -129,7 +129,7 @@ pkg_name_is_illegal(const char *p, const char **ep) static const char alsoallowed[] = "-+._"; static char buf[150]; int c; - + if (!*p) return _("may not be empty string"); if (!isalnum(*p)) return _("must start with an alphanumeric"); while ((c = *p++) != '\0') @@ -166,7 +166,7 @@ informativeversion(const struct versionrevision *version) void varbufversion (struct varbuf *vb, const struct versionrevision *version, - enum versiondisplayepochwhen vdew) + enum versiondisplayepochwhen vdew) { switch (vdew) { case vdew_never: @@ -197,7 +197,7 @@ const char *versiondescribe static int bufnum=0; struct varbuf *vb; - + if (!informativeversion(version)) return _("<none>"); vb= &bufs[bufnum]; bufnum++; if (bufnum == 10) bufnum= 0; @@ -358,4 +358,3 @@ parse_ensure_have_field(struct parsedb_state *ps, parse_warn(ps, pigp, _("empty value for %s"), what); } } - diff --git a/lib/dpkg/path.c b/lib/dpkg/path.c index c6caf15af..1dd736bc9 100644 --- a/lib/dpkg/path.c +++ b/lib/dpkg/path.c @@ -156,4 +156,3 @@ path_quote_filename(char *dst, const char *src, size_t n) return r; } - diff --git a/lib/dpkg/path.h b/lib/dpkg/path.h index 60685563a..354354121 100644 --- a/lib/dpkg/path.h +++ b/lib/dpkg/path.h @@ -36,4 +36,3 @@ char *path_make_temp_template(const char *suffix); DPKG_END_DECLS #endif /* LIBDPKG_PATH_H */ - diff --git a/lib/dpkg/pkg-array.c b/lib/dpkg/pkg-array.c index 19e95b8cf..0f1d9bf03 100644 --- a/lib/dpkg/pkg-array.c +++ b/lib/dpkg/pkg-array.c @@ -79,4 +79,3 @@ pkg_array_destroy(struct pkg_array *a) free(a->pkgs); a->pkgs = NULL; } - diff --git a/lib/dpkg/pkg-format.c b/lib/dpkg/pkg-format.c index 4c44acc30..d5f8a3f02 100644 --- a/lib/dpkg/pkg-format.c +++ b/lib/dpkg/pkg-format.c @@ -267,4 +267,3 @@ pkg_format_show(const struct pkg_format_node *head, varbuf_destroy(&fb); varbuf_destroy(&vb); } - diff --git a/lib/dpkg/pkg-list.c b/lib/dpkg/pkg-list.c index 685946856..70baa0821 100644 --- a/lib/dpkg/pkg-list.c +++ b/lib/dpkg/pkg-list.c @@ -76,4 +76,3 @@ pkg_list_prepend(struct pkg_list **head, struct pkginfo *pkg) { *head = pkg_list_new(pkg, *head); } - diff --git a/lib/dpkg/pkg-queue.c b/lib/dpkg/pkg-queue.c index 0e1c3e11f..9d7079d5a 100644 --- a/lib/dpkg/pkg-queue.c +++ b/lib/dpkg/pkg-queue.c @@ -124,4 +124,3 @@ pkg_queue_pop(struct pkg_queue *queue) return pkg; } - diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c index 3510b8b6a..88f129691 100644 --- a/lib/dpkg/pkg-show.c +++ b/lib/dpkg/pkg-show.c @@ -47,4 +47,3 @@ pkg_summary(const struct pkginfo *pkg, int *len_ret) return pdesc; } - diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c index 7598860b0..c7b0d72a0 100644 --- a/lib/dpkg/pkg.c +++ b/lib/dpkg/pkg.c @@ -46,4 +46,3 @@ pkg_sorter_by_name(const void *a, const void *b) return strcmp(pa->name, pb->name); } - diff --git a/lib/dpkg/progress.c b/lib/dpkg/progress.c index 0fb547050..849393dbe 100644 --- a/lib/dpkg/progress.c +++ b/lib/dpkg/progress.c @@ -69,4 +69,3 @@ progress_done(struct progress *progress) if (progress->on_tty) printf("\r%s", progress->text); } - diff --git a/lib/dpkg/progress.h b/lib/dpkg/progress.h index 496846701..9bc490601 100644 --- a/lib/dpkg/progress.h +++ b/lib/dpkg/progress.h @@ -44,4 +44,3 @@ void progress_done(struct progress *progress); DPKG_END_DECLS #endif - diff --git a/lib/dpkg/string.c b/lib/dpkg/string.c index e3b8ed302..20cec1ea0 100644 --- a/lib/dpkg/string.c +++ b/lib/dpkg/string.c @@ -83,4 +83,3 @@ str_strip_quotes(char *str) return str; } - diff --git a/lib/dpkg/string.h b/lib/dpkg/string.h index af879e85c..c65b880d8 100644 --- a/lib/dpkg/string.h +++ b/lib/dpkg/string.h @@ -31,4 +31,3 @@ char *str_strip_quotes(char *str); DPKG_END_DECLS #endif /* LIBDPKG_STRING_H */ - diff --git a/lib/dpkg/subproc.c b/lib/dpkg/subproc.c index 7a4897976..b82248e27 100644 --- a/lib/dpkg/subproc.c +++ b/lib/dpkg/subproc.c @@ -161,4 +161,3 @@ subproc_wait_check(pid_t pid, const char *desc, int flags) return subproc_check(status, desc, flags); } - diff --git a/lib/dpkg/subproc.h b/lib/dpkg/subproc.h index 0a0236545..81fb12239 100644 --- a/lib/dpkg/subproc.h +++ b/lib/dpkg/subproc.h @@ -42,4 +42,3 @@ int subproc_wait_check(pid_t pid, const char *desc, int flags); DPKG_END_DECLS #endif /* LIBDPKG_SUBPROC_H */ - diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c index 8172052cd..0817c88b6 100644 --- a/lib/dpkg/tarfn.c +++ b/lib/dpkg/tarfn.c @@ -402,4 +402,3 @@ tar_extractor(void *ctx, const struct tar_operations *ops) return status; } } - diff --git a/lib/dpkg/test.h b/lib/dpkg/test.h index 664e4aefc..4e7dc318f 100644 --- a/lib/dpkg/test.h +++ b/lib/dpkg/test.h @@ -54,4 +54,3 @@ main(int argc, char **argv) #endif #endif - diff --git a/lib/dpkg/test/Makefile.am b/lib/dpkg/test/Makefile.am index 610ca27fc..b747f1e30 100644 --- a/lib/dpkg/test/Makefile.am +++ b/lib/dpkg/test/Makefile.am @@ -37,4 +37,3 @@ t_varbuf_LDADD = $(CHECK_LDADD) t_version_LDADD = $(CHECK_LDADD) TESTS = $(check_PROGRAMS) - diff --git a/lib/dpkg/test/t-buffer.c b/lib/dpkg/test/t-buffer.c index 5063483d4..f90167d8f 100644 --- a/lib/dpkg/test/t-buffer.c +++ b/lib/dpkg/test/t-buffer.c @@ -46,4 +46,3 @@ test(void) { test_buffer_hash(); } - diff --git a/lib/dpkg/test/t-command.c b/lib/dpkg/test/t-command.c index 881cab79c..a1b543c70 100644 --- a/lib/dpkg/test/t-command.c +++ b/lib/dpkg/test/t-command.c @@ -161,4 +161,3 @@ test(void) test_command_add_args(); test_command_exec(); } - diff --git a/lib/dpkg/test/t-macros.c b/lib/dpkg/test/t-macros.c index 1616a9edc..2b19775b0 100644 --- a/lib/dpkg/test/t-macros.c +++ b/lib/dpkg/test/t-macros.c @@ -37,4 +37,3 @@ test(void) test_pass(max(0, 10) == 10); test_pass(max(-10, 0) == 0); } - diff --git a/lib/dpkg/test/t-path.c b/lib/dpkg/test/t-path.c index d59288a1a..a3bf78436 100644 --- a/lib/dpkg/test/t-path.c +++ b/lib/dpkg/test/t-path.c @@ -165,4 +165,3 @@ test(void) test_path_temp(); test_path_quote(); } - diff --git a/lib/dpkg/test/t-pkg-list.c b/lib/dpkg/test/t-pkg-list.c index e7fa22a12..9a446e370 100644 --- a/lib/dpkg/test/t-pkg-list.c +++ b/lib/dpkg/test/t-pkg-list.c @@ -87,4 +87,3 @@ test(void) test_pkg_list_new(); test_pkg_list_prepend(); } - diff --git a/lib/dpkg/test/t-pkg-queue.c b/lib/dpkg/test/t-pkg-queue.c index 9a05d7cc9..967a1be0d 100644 --- a/lib/dpkg/test/t-pkg-queue.c +++ b/lib/dpkg/test/t-pkg-queue.c @@ -115,4 +115,3 @@ test(void) test_pkg_queue_init(); test_pkg_queue_push_pop(); } - diff --git a/lib/dpkg/test/t-pkginfo.c b/lib/dpkg/test/t-pkginfo.c index 7fe6100c6..b1df8f8d2 100644 --- a/lib/dpkg/test/t-pkginfo.c +++ b/lib/dpkg/test/t-pkginfo.c @@ -49,4 +49,3 @@ test(void) /* FIXME: Complete. */ } - diff --git a/lib/dpkg/test/t-string.c b/lib/dpkg/test/t-string.c index 689f387e6..9f5fd7d60 100644 --- a/lib/dpkg/test/t-string.c +++ b/lib/dpkg/test/t-string.c @@ -111,4 +111,3 @@ test(void) test_str_escape_fmt(); test_str_strip_quotes(); } - diff --git a/lib/dpkg/test/t-test.c b/lib/dpkg/test/t-test.c index 5b87fcd09..b73a389b7 100644 --- a/lib/dpkg/test/t-test.c +++ b/lib/dpkg/test/t-test.c @@ -44,4 +44,3 @@ test(void) test_mem("ababcd", ==, "ababff", 4); test_mem("ababcd", !=, "ababff", 6); } - diff --git a/lib/dpkg/test/t-varbuf.c b/lib/dpkg/test/t-varbuf.c index 637c6cc56..e6242e695 100644 --- a/lib/dpkg/test/t-varbuf.c +++ b/lib/dpkg/test/t-varbuf.c @@ -283,4 +283,3 @@ test(void) /* FIXME: Complete. */ } - diff --git a/lib/dpkg/test/t-version.c b/lib/dpkg/test/t-version.c index 3c37bf44f..deb088329 100644 --- a/lib/dpkg/test/t-version.c +++ b/lib/dpkg/test/t-version.c @@ -152,4 +152,3 @@ test(void) test_version_compare(); test_version_parse(); } - diff --git a/lib/dpkg/trigdeferred.l b/lib/dpkg/trigdeferred.l index 0a9f05e50..a3a10b833 100644 --- a/lib/dpkg/trigdeferred.l +++ b/lib/dpkg/trigdeferred.l @@ -237,4 +237,3 @@ trigdef_process_done(void) /* Unlock. */ pop_cleanup(ehflag_normaltidy); } - diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c index bbae7d759..df48cea9c 100644 --- a/lib/dpkg/triglib.c +++ b/lib/dpkg/triglib.c @@ -857,6 +857,7 @@ th_simple_nn_find(const char *name, bool nonew) for (search = trigger_files; search; search = search->next) if (!strcmp(search->name, name)) return search; + /* Not found. */ if (nonew) return NULL; diff --git a/lib/dpkg/utils.c b/lib/dpkg/utils.c index 3953f96aa..0eb764594 100644 --- a/lib/dpkg/utils.c +++ b/lib/dpkg/utils.c @@ -76,4 +76,3 @@ fgets_must(char *buf, size_t bufsz, FILE *f, const char *fn) return l; } - |