[Pkg-wmaker-commits] [wmbubble] 24/207: Remove some more pointless/unused code

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbubble.

commit 612790dc4075b44159da37af60d1035fae8121b2
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Tue Jul 26 20:07:16 2011 -0700

    Remove some more pointless/unused code
---
 bubblemon.c | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/bubblemon.c b/bubblemon.c
index d5f70d4..fdbebe0 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -476,23 +476,6 @@ static int get_screen_selection(void) {
 
 	XQueryKeymap(wmxp_display, keys);
 
-#if 0
-	if (0) {			/* debug */
-		int i = 0;
-		printf("lshift_code = 0x%x (index = %d, bit = %d\n", lshift_code,
-		       lshift_code >> 3, lshift_code % 8);
-		printf("rshift_code = 0x%x (index = %d, bit = %d\n", rshift_code,
-		       rshift_code >> 3, rshift_code % 8);
-		for (i = 0; i < (sizeof(keys) / sizeof(keys[0])); i++) {
-			if (0 == (i % 8)) {
-				printf("\n%2d:", i);
-			}
-			printf(" %2d", keys[i]);
-		}
-		printf("\n");
-	}
-#endif
-
 	if ((keys[lshift_code >> 3] == (1 << (lshift_code % 8))) ||
 	    (keys[rshift_code >> 3] == (1 << (rshift_code % 8)))) {
 		return 0;
@@ -1364,24 +1347,15 @@ static void bubblemon_allocate_buffers(void) {
 	bm.bubbles = (Bubble *) malloc(sizeof(Bubble) * bm.maxbubbles);
 
 	/* Allocate (zeroed) bubble memory */
-	if (bm.bubblebuf)
-		free(bm.bubblebuf);
-
 	bm.bubblebuf = calloc(BOX_SIZE * (BOX_SIZE+4), sizeof(char));
 
 	/* Allocate water level memory */
-	if (bm.waterlevels)
-		free(bm.waterlevels);
-
 	bm.waterlevels = malloc(BOX_SIZE * sizeof(int));
 	for (i = 0; i < BOX_SIZE; i++) {
 		bm.waterlevels[i] = MAKEY(BOX_SIZE);
 	}
 
 	/* Allocate water level velocity memory */
-	if (bm.waterlevels_dy)
-		free(bm.waterlevels_dy);
-
 	bm.waterlevels_dy = calloc(BOX_SIZE, sizeof(int));
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git