client_cyclenext() -> client_cycle() since we now pass an arg.

removes a stray proto as well.

discussed with and ok oga@

3 files changed, 6 insertions, 7 deletions

diff --git a/calmwm.h b/calmwm.h
index fec4cba..1472aa1 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: calmwm.h,v 1.45 2008/05/19 17:13:55 oga Exp $
+ * $Id: calmwm.h,v 1.46 2008/05/19 17:24:19 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -340,7 +340,6 @@ void			 client_ptrwarp(struct client_ctx *);
 void			 client_ptrsave(struct client_ctx *);
 void			 client_draw_border(struct client_ctx *);
 void			 client_update(struct client_ctx *);
-void			 client_cycle(struct client_ctx *);
 void			 client_placecalc(struct client_ctx *);
 void			 client_maximize(struct client_ctx *);
 void			 client_vertmaximize(struct client_ctx *);
@@ -348,7 +347,7 @@ u_long			 client_bg_pixel(struct client_ctx *);
 Pixmap			 client_bg_pixmap(struct client_ctx *);
 void			 client_map(struct client_ctx *cc);
 void			 client_mtf(struct client_ctx *cc);
-struct client_ctx	*client_cyclenext(int reverse);
+struct client_ctx	*client_cycle(int reverse);
 struct client_ctx	*client_mrunext(struct client_ctx *cc);
 struct client_ctx	*client_mruprev(struct client_ctx *cc);
 void			 client_gethints(struct client_ctx *cc);
diff --git a/client.c b/client.c
index 5d9f185..a5cd9af 100644
--- a/client.c
+++ b/client.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: client.c,v 1.25 2008/05/19 15:17:50 oga Exp $
+ * $Id: client.c,v 1.26 2008/05/19 17:24:19 okan Exp $
  */
 
 #include "headers.h"
@@ -590,7 +590,7 @@ match:
 }
 
 struct client_ctx *
-client_cyclenext(int reverse)
+client_cycle(int reverse)
 {
 	struct client_ctx	*oldcc = client_current(), *newcc;
 	struct screen_ctx	*sc = screen_current();
diff --git a/kbfunc.c b/kbfunc.c
index e4a3574..6f7a881 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: kbfunc.c,v 1.25 2008/05/19 17:11:19 okan Exp $
+ * $Id: kbfunc.c,v 1.26 2008/05/19 17:24:19 okan Exp $
  */
 
 #include <paths.h>
@@ -182,7 +182,7 @@ kbfunc_client_cycle(struct client_ctx *scratch, void *arg)
 	XGrabKeyboard(X_Dpy, sc->rootwin, True,
 	    GrabModeAsync, GrabModeAsync, CurrentTime);
 
-	client_cyclenext((int)arg);
+	client_cycle((int)arg);
 }
 
 void