diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-03-24 00:09:45 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-03-24 00:09:45 +0100 |
| commit | 9277fe13156a6ff2b055fe8a58d2863115c36b6a (patch) | |
| tree | e18028ac10b9c1650a9d1e8f4f4789556c268b7d /libc/misc/utmp/utxent.c | |
| parent | 63729418992d5f63965a88fa2ac3570e3d270479 (diff) | |
Revert "utent.c, wtent.c: move functions from utxent.c"
This reverts commit 84135275cfeebc0b233c1c96eeada4d4178a0b18.
This change is said to make systemd deadlock (cannot reproduce this)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Conflicts:
include/utmp.h
Diffstat (limited to 'libc/misc/utmp/utxent.c')
| -rw-r--r-- | libc/misc/utmp/utxent.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libc/misc/utmp/utxent.c b/libc/misc/utmp/utxent.c index 71157ccd8..a0e80a662 100644 --- a/libc/misc/utmp/utxent.c +++ b/libc/misc/utmp/utxent.c @@ -13,7 +13,6 @@ #include <utmpx.h> #include <utmp.h> -#if 0 /* moved to utent.c */ void setutxent(void) { setutent (); @@ -49,12 +48,10 @@ int utmpxname (const char *new_ut_name) return utmpname (new_ut_name); } -/* moved to wtent.c */ void updwtmpx (const char *wtmpx_file, const struct utmpx *utmpx) { updwtmp (wtmpx_file, (const struct utmp *) utmpx); } -#endif /* Copy the information in UTMPX to UTMP. */ void getutmp (const struct utmpx *utmpx, struct utmp *utmp) @@ -107,3 +104,4 @@ void getutmpx (const struct utmp *utmp, struct utmpx *utmpx) utmpx->ut_time = utmp->ut_time; #endif } + |