From e39f85990981de328959c30ea3e01b3e320acbfd Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 12 Apr 2014 13:48:08 +0200 Subject: [PATCH] Use C-style comments rather than C++-style so /* */ instead of // --- config.h | 4 ++-- ioncore/focus.c | 20 ++++++++++---------- ioncore/focus.h | 2 +- ioncore/global.h | 6 +++--- libmainloop/exec.c | 4 ++-- libmainloop/signal.c | 4 ++-- mod_statusbar/statusd-launch.c | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/config.h b/config.h index 351f3ed8..3e61db32 100644 --- a/config.h +++ b/config.h @@ -31,10 +31,10 @@ #define CF_USERTIME_DIFF_CURRENT 2000 #define CF_USERTIME_DIFF_NEW 4000 -// disable this by default +/* disable this by default */ #define CF_FOCUSLIST_INSERT_DELAY 0 -// disable this by default +/* disable this by default */ #define CF_WORKSPACE_INDICATOR_TIMEOUT 0 /* Cursors diff --git a/ioncore/focus.c b/ioncore/focus.c index 982141d9..c26d54fb 100644 --- a/ioncore/focus.c +++ b/ioncore/focus.c @@ -87,8 +87,8 @@ WRegion *ioncore_goto_previous() if(ioncore_g.focuslist==NULL) return NULL; - // We're trying to access the focus list from lua (likely from the UI). I - // thus force any pending focuslist updates to complete now + /* We're trying to access the focus list from lua (likely from the UI). I + * thus force any pending focuslist updates to complete now */ region_focuslist_awaiting_insertion_trigger(); /* Find the first region on focus history list that isn't currently @@ -123,8 +123,8 @@ bool ioncore_focushistory_i(ExtlFn iterfn) if(ioncore_g.focuslist==NULL) return FALSE; - // We're trying to access the focus list from lua (likely from the UI). I - // thus force any pending focuslist updates to complete now + /* We're trying to access the focus list from lua (likely from the UI). I + * thus force any pending focuslist updates to complete now */ region_focuslist_awaiting_insertion_trigger(); /* Find the first region on focus history list that isn't currently @@ -236,7 +236,7 @@ static void timer_expired__focuslist_insert(WTimer* dummy1, Obj* dummy2) static void schedule_focuslist_insert_timer(WRegion *reg) { - // if the delay is disabled, add to the list NOW + /* if the delay is disabled, add to the list NOW */ if( ioncore_g.focuslist_insert_delay <= 0 ) { region_focuslist_push(reg); @@ -291,9 +291,9 @@ void region_got_focus(WRegion *reg) if(reg->active_sub==NULL) { - // I update the current focus indicator right now. The focuslist is - // updated on a timer to keep the list ordered by importance (to keep - // windows that the user quickly cycles through at the bottom of the list) + /* I update the current focus indicator right now. The focuslist is + * updated on a timer to keep the list ordered by importance (to keep + * windows that the user quickly cycles through at the bottom of the list) */ ioncore_g.focus_current = reg; schedule_focuslist_insert_timer(reg); } @@ -355,8 +355,8 @@ void region_lost_focus(WRegion *reg) void region_focus_deinit(WRegion *reg) { - // if the region that's waiting to be added to the focuslist is being - // deleted, cancel the insertion + /* if the region that's waiting to be added to the focuslist is being + * deleted, cancel the insertion */ if(region_awaiting_insertion) region_focuslist_awaiting_insertion_cancel_if_is(reg); diff --git a/ioncore/focus.h b/ioncore/focus.h index 0422a528..6be874d8 100644 --- a/ioncore/focus.h +++ b/ioncore/focus.h @@ -63,7 +63,7 @@ WRegion *ioncore_current(); extern void region_pointer_focus_hack(WRegion *reg); -// testing/debugging helper +/* testing/debugging helper */ void region_focuslist_debugprint(void); #endif /* ION_IONCORE_FOCUS_H */ diff --git a/ioncore/global.h b/ioncore/global.h index a3fa172e..0a97120c 100644 --- a/ioncore/global.h +++ b/ioncore/global.h @@ -89,9 +89,9 @@ DECLSTRUCT(WGlobal){ */ WRegion* focuslist; - // This is the region that is currently focused. It is usually the first - // item in the focuslist, but not always. It isn't the first item if - // focuslist_insert_delay is enabled, and the corresponding timer is active + /* This is the region that is currently focused. It is usually the first + * item in the focuslist, but not always. It isn't the first item if + * focuslist_insert_delay is enabled, and the corresponding timer is active */ WRegion* focus_current; diff --git a/libmainloop/exec.c b/libmainloop/exec.c index 71d36531..77972c09 100644 --- a/libmainloop/exec.c +++ b/libmainloop/exec.c @@ -108,7 +108,7 @@ pid_t mainloop_fork(void (*fn)(void *p), void *fnp, goto err3; if(pid!=0){ - // We're the parent + /* We're the parent */ if(outfd!=NULL){ if(!unblock(outfds[0])) @@ -131,7 +131,7 @@ pid_t mainloop_fork(void (*fn)(void *p), void *fnp, return pid; } else { - // We're the child + /* We're the child */ if(infd!=NULL) duppipe(0, 0, infds); diff --git a/libmainloop/signal.c b/libmainloop/signal.c index 17e58a6d..ed1ba84d 100644 --- a/libmainloop/signal.c +++ b/libmainloop/signal.c @@ -504,8 +504,8 @@ void mainloop_trap_signals(const sigset_t *which) sigemptyset(&oldset); sigprocmask(SIG_SETMASK, &set, &oldset); - // I do not handle SIG{ILL,SEGV,FPE,BUS} since there's not much I can do in - // response + /* I do not handle SIG{ILL,SEGV,FPE,BUS} since there's not much I can do in + * response */ DEADLY(SIGHUP); DEADLY(SIGQUIT); diff --git a/mod_statusbar/statusd-launch.c b/mod_statusbar/statusd-launch.c index c00599ce..592ab4b7 100644 --- a/mod_statusbar/statusd-launch.c +++ b/mod_statusbar/statusd-launch.c @@ -190,8 +190,8 @@ int mod_statusbar__terminate_statusd(int pid) return -1; } - // Send SIGHUP to the specified statusd process to indicate - // that we're done. + /* Send SIGHUP to the specified statusd process to indicate + * that we're done. */ kill( (pid_t)pid, SIGHUP); return 0; -- 2.11.4.GIT