From f530e5452dcd9081f88da35e1b465fd01e243167 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 20 Mar 2013 16:58:30 +0100 Subject: [PATCH] Do not use ELOG while logwalk is not initialized --- src/log.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/log.c b/src/log.c index 42e714ef..e858f94e 100644 --- a/src/log.c +++ b/src/log.c @@ -81,11 +81,11 @@ static void store_log_markers(void) { void init_logging(void) { if (!errorfilename) { if (!(errorfilename = get_process_filename("errorlog"))) - ELOG("Could not initialize errorlog\n"); + fprintf(stderr, "Could not initialize errorlog\n"); else { errorfile = fopen(errorfilename, "w"); if (fcntl(fileno(errorfile), F_SETFD, FD_CLOEXEC)) { - ELOG("Could not set close-on-exec flag\n"); + fprintf(stderr, "Could not set close-on-exec flag\n"); } } } @@ -110,14 +110,14 @@ void init_logging(void) { sasprintf(&shmlogname, "/i3-log-%d", getpid()); logbuffer_shm = shm_open(shmlogname, O_RDWR | O_CREAT, S_IREAD | S_IWRITE); if (logbuffer_shm == -1) { - ELOG("Could not shm_open SHM segment for the i3 log: %s\n", strerror(errno)); + fprintf(stderr, "Could not shm_open SHM segment for the i3 log: %s\n", strerror(errno)); return; } if (ftruncate(logbuffer_shm, logbuffer_size) == -1) { close(logbuffer_shm); shm_unlink("/i3-log-"); - ELOG("Could not ftruncate SHM segment for the i3 log: %s\n", strerror(errno)); + fprintf(stderr, "Could not ftruncate SHM segment for the i3 log: %s\n", strerror(errno)); return; } @@ -125,7 +125,7 @@ void init_logging(void) { if (logbuffer == MAP_FAILED) { close(logbuffer_shm); shm_unlink("/i3-log-"); - ELOG("Could not mmap SHM segment for the i3 log: %s\n", strerror(errno)); + fprintf(stderr, "Could not mmap SHM segment for the i3 log: %s\n", strerror(errno)); logbuffer = NULL; return; } @@ -138,7 +138,7 @@ void init_logging(void) { pthread_condattr_t cond_attr; pthread_condattr_init(&cond_attr); if (pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED) != 0) - ELOG("pthread_condattr_setpshared() failed, i3-dump-log -f will not work!\n"); + fprintf(stderr, "pthread_condattr_setpshared() failed, i3-dump-log -f will not work!\n"); pthread_cond_init(&(header->condvar), &cond_attr); logwalk = logbuffer + sizeof(i3_shmlog_header); -- 2.39.5