summaryrefslogtreecommitdiff
path: root/hwclock/hwclock.c
diff options
context:
space:
mode:
authorLaMont Jones <lamont@debian.org>2009-07-21 15:45:04 -0600
committerLaMont Jones <lamont@debian.org>2009-07-21 15:45:04 -0600
commit7a22bb9abcb56d1010cefd204709e3888f95f735 (patch)
tree5c38b4485f79ee8f6a9d5f9537e973f1f663f027 /hwclock/hwclock.c
parent4e13a18f57a5b427c559f3b466b9655db14d28f8 (diff)
parent741064af10ec81635d708e9fb8373f96341246eb (diff)
downloadutil-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 'hwclock/hwclock.c')
-rw-r--r--hwclock/hwclock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c
index 6126a5fb..f691dfe5 100644
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -676,7 +676,7 @@ interpret_date_string(const char *date_opt, time_t * const time_p) {
date_opt, (long) *time_p);
}
}
- fclose(date_child_fp);
+ pclose(date_child_fp);
return retcode;
}