Suggections from bde@

1) Split too long source lines
2) Portable code should not assume that null pointer == all-bits-0,
so back out prev. calloc() change.

Submitted by:   bde

2 files changed, 11 insertions, 5 deletions

diff --git a/games/random/random.c b/games/random/random.c
index 2580348..c1be97b 100644
--- a/games/random/random.c
+++ b/games/random/random.c
@@ -180,7 +180,8 @@ main(int argc, char *argv[])
 				err(2, "stdout");
 
 			/* Now see if the next line is to be printed. */
-			selected = (int)(denom * random() / RANDOM_MAX_PLUS1) == 0;
+			selected = (int)(denom * random() /
+				RANDOM_MAX_PLUS1) == 0;
 		}
 	}
 	if (ferror(stdin))
diff --git a/games/random/randomize_fd.c b/games/random/randomize_fd.c
index 960c4b9..94881f7 100644
--- a/games/random/randomize_fd.c
+++ b/games/random/randomize_fd.c
@@ -48,10 +48,13 @@ rand_node_allocate(void)
 {
 	struct rand_node *n;
 
-	n = (struct rand_node *)calloc(1, sizeof(struct rand_node));
+	n = (struct rand_node *)malloc(sizeof(struct rand_node));
 	if (n == NULL)
-		err(1, "calloc");
+		err(1, "malloc");
 
+	n->len = 0;
+	n->cp = NULL;
+	n->next = NULL;
 	return(n);
 }
 
@@ -212,8 +215,10 @@ randomize_fd(int fd, int type, int unique, double denom)
 				if (n->cp == NULL)
 					break;
 
-				if ((int)(denom * random() / RANDOM_MAX_PLUS1) == 0) {
-					ret = printf("%.*s", (int)n->len - 1, n->cp);
+				if ((int)(denom * random() /
+					RANDOM_MAX_PLUS1) == 0) {
+					ret = printf("%.*s",
+						(int)n->len - 1, n->cp);
 					if (ret < 0)
 						err(1, "printf");
 				}