diff options
| author | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
| commit | 7a22bb9abcb56d1010cefd204709e3888f95f735 (patch) | |
| tree | 5c38b4485f79ee8f6a9d5f9537e973f1f663f027 /text-utils/pg.c | |
| parent | 4e13a18f57a5b427c559f3b466b9655db14d28f8 (diff) | |
| parent | 741064af10ec81635d708e9fb8373f96341246eb (diff) | |
| download | util-linux-old-7a22bb9abcb56d1010cefd204709e3888f95f735.tar.gz | |
Merge commit 'origin/master'
Conflicts:
AUTHORS
NEWS
config/include-Makefile.am
configure.ac
mount/lomount.c
po/POTFILES.in
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
Diffstat (limited to 'text-utils/pg.c')
| -rw-r--r-- | text-utils/pg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/text-utils/pg.c b/text-utils/pg.c index 30c67009..b2c4d873 100644 --- a/text-utils/pg.c +++ b/text-utils/pg.c @@ -220,7 +220,7 @@ smalloc(size_t s) { char *m = (char *)malloc(s); if (m == NULL) { - char *p = _("Out of memory\n"); + const char *p = _("Out of memory\n"); write(2, p, strlen(p)); quit(++exitstatus); } @@ -1507,7 +1507,7 @@ found_bw: /* * Help! */ - char *help = _(helpscreen); + const char *help = _(helpscreen); write(1, copyright + 4, strlen(copyright + 4)); write(1, help, strlen(help)); goto newcmd; |