2012-12-13 07:10:13 -05:00
|
|
|
$OpenBSD: patch-src_startup_c,v 1.2 2012/12/13 12:10:14 dcoppa Exp $
|
2012-09-21 13:16:13 -04:00
|
|
|
|
|
|
|
|
On OpenBSD, time_t is an int.
|
|
|
|
|
|
2012-12-13 07:10:13 -05:00
|
|
|
--- src/startup.c.orig Thu Dec 13 10:27:52 2012
|
|
|
|
|
+++ src/startup.c Thu Dec 13 10:28:36 2012
|
|
|
|
|
@@ -104,7 +104,7 @@ static int _prune_startup_sequences(void) {
|
|
|
|
|
*/
|
|
|
|
|
void startup_sequence_delete(struct Startup_Sequence *sequence) {
|
|
|
|
|
assert(sequence != NULL);
|
|
|
|
|
- DLOG("Deleting startup sequence %s, delete_at = %ld, current_time = %ld\n",
|
|
|
|
|
+ DLOG("Deleting startup sequence %s, delete_at = %d, current_time = %d\n",
|
|
|
|
|
sequence->id, sequence->delete_at, time(NULL));
|
2012-09-21 13:16:13 -04:00
|
|
|
|
2012-12-13 07:10:13 -05:00
|
|
|
/* Unref the context, will be free()d */
|
|
|
|
|
@@ -246,7 +246,7 @@ void startup_monitor_event(SnMonitorEvent *event, void
|
|
|
|
|
/* Mark the given sequence for deletion in 30 seconds. */
|
|
|
|
|
time_t current_time = time(NULL);
|
|
|
|
|
sequence->delete_at = current_time + 30;
|
|
|
|
|
- DLOG("Will delete startup sequence %s at timestamp %ld\n",
|
|
|
|
|
+ DLOG("Will delete startup sequence %s at timestamp %d\n",
|
|
|
|
|
sequence->id, sequence->delete_at);
|
2012-09-21 13:16:13 -04:00
|
|
|
|
2012-12-13 07:10:13 -05:00
|
|
|
if (_prune_startup_sequences() == 0) {
|
