diff options
| author | Guillem Jover <guillem@debian.org> | 2011-03-14 07:16:31 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2011-03-14 07:21:56 +0100 |
| commit | 79a67e901e0ce82944d33f13d0830fe256f9a39c (patch) | |
| tree | ceebf891427c7bd584c463ca2756c16123567f03 /dpkg-split | |
| parent | 26998971c3e84e33a4602e3d97a6a8c9a058fa16 (diff) | |
| download | dpkg-79a67e901e0ce82944d33f13d0830fe256f9a39c.tar.gz | |
Inline rerr() into its only current call site
Diffstat (limited to 'dpkg-split')
| -rw-r--r-- | dpkg-split/dpkg-split.h | 1 | ||||
| -rw-r--r-- | dpkg-split/info.c | 5 | ||||
| -rw-r--r-- | dpkg-split/main.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/dpkg-split/dpkg-split.h b/dpkg-split/dpkg-split.h index 4d1280c3e..cd2d6bb71 100644 --- a/dpkg-split/dpkg-split.h +++ b/dpkg-split/dpkg-split.h @@ -58,7 +58,6 @@ extern const char *opt_outputfile; extern int opt_npquiet; extern int opt_msdos; -void rerr(const char *fn) DPKG_ATTR_NORET; void rerreof(FILE *f, const char *fn) DPKG_ATTR_NORET; void print_info(const struct partinfo *pi); struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir); diff --git a/dpkg-split/info.c b/dpkg-split/info.c index f42738570..3780c434d 100644 --- a/dpkg-split/info.c +++ b/dpkg-split/info.c @@ -81,7 +81,10 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir) struct stat stab; if (fread(magicbuf, 1, sizeof(magicbuf), partfile) != sizeof(magicbuf)) { - if (ferror(partfile)) rerr(fn); else return NULL; + if (ferror(partfile)) + ohshite(_("error reading %.250s"), fn); + else + return NULL; } if (memcmp(magicbuf, DPKG_AR_MAGIC, sizeof(magicbuf))) return NULL; diff --git a/dpkg-split/main.c b/dpkg-split/main.c index 70473d97c..ee825450a 100644 --- a/dpkg-split/main.c +++ b/dpkg-split/main.c @@ -104,10 +104,6 @@ const char *opt_outputfile = NULL; int opt_npquiet = 0; int opt_msdos = 0; -void rerr(const char *fn) { - ohshite(_("error reading %.250s"), fn); -} - void rerreof(FILE *f, const char *fn) { if (ferror(f)) ohshite(_("error reading %.250s"),fn); ohshit(_("unexpected end of file in %.250s"),fn); |