diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-24 04:51:33 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-24 04:51:33 +0200 |
| commit | e3e3d49f0bd8b829e1b3cedd5b092e2868980fb0 (patch) | |
| tree | ffc64ecc3839d02534f5194bdfb74c50b3f2c9a9 /src/Daemon/Daemon.cpp | |
| parent | 9802f19eb7930494cb1802326bc130b9022b50cc (diff) | |
| download | abrt-e3e3d49f0bd8b829e1b3cedd5b092e2868980fb0.tar.gz abrt-e3e3d49f0bd8b829e1b3cedd5b092e2868980fb0.tar.xz abrt-e3e3d49f0bd8b829e1b3cedd5b092e2868980fb0.zip | |
make some variables local; rename a few typedefs
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'src/Daemon/Daemon.cpp')
| -rw-r--r-- | src/Daemon/Daemon.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index f0b60eb..cb9e7dd 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -48,8 +48,6 @@ typedef struct cron_callback_data_t static uint8_t sig_caught; /* = 0 */ -static int g_nFd; -static GIOChannel* g_pGio; static GMainLoop* g_pMainloop; static CSettings* g_pSettings; @@ -535,6 +533,7 @@ static gboolean handle_event_cb(GIOChannel *gio, GIOCondition condition, gpointe int main(int argc, char** argv) { + GIOChannel* pGio; int daemonize = 0; signal(SIGTERM, handle_fatal_signal); @@ -587,10 +586,10 @@ int main(int argc, char** argv) comm_layer_inner_init(&watcher); /* Watching DEBUG_DUMPS_DIR for new files... */ errno = 0; - g_nFd = inotify_init(); - if (g_nFd == -1) + int inotify_fd = inotify_init(); + if (inotify_fd == -1) perror_msg_and_die("inotify_init failed"); - if (inotify_add_watch(g_nFd, DEBUG_DUMPS_DIR, IN_CREATE) == -1) + if (inotify_add_watch(inotify_fd, DEBUG_DUMPS_DIR, IN_CREATE) == -1) perror_msg_and_die("inotify_add_watch failed on '%s'", DEBUG_DUMPS_DIR); /* (comment here) */ g_pSettings = new CSettings(); @@ -610,8 +609,8 @@ int main(int argc, char** argv) #endif g_pCommLayer->Attach(&watcher); /* (comment here) */ - g_pGio = g_io_channel_unix_new(g_nFd); - g_io_add_watch(g_pGio, G_IO_IN, handle_event_cb, NULL); + pGio = g_io_channel_unix_new(inotify_fd); + g_io_add_watch(pGio, G_IO_IN, handle_event_cb, NULL); /* Add an event source which waits for INT/TERM signal */ GSourceFuncs waitsignal_funcs; memset(&waitsignal_funcs, 0, sizeof(waitsignal_funcs)); @@ -630,7 +629,7 @@ int main(int argc, char** argv) /* Initialization error. Clean up, in reverse order */ unlink(VAR_RUN_PIDFILE); unlink(VAR_RUN_LOCK_FILE); - g_io_channel_unref(g_pGio); + g_io_channel_unref(pGio); delete g_pCommLayer; /* This restores /proc/sys/kernel/core_pattern, among other things: */ delete g_pMW; @@ -668,7 +667,7 @@ int main(int argc, char** argv) /* Error or INT/TERM. Clean up, in reverse order */ unlink(VAR_RUN_PIDFILE); unlink(VAR_RUN_LOCK_FILE); - g_io_channel_unref(g_pGio); + g_io_channel_unref(pGio); delete g_pCommLayer; /* This restores /proc/sys/kernel/core_pattern, among other things: */ delete g_pMW; |