[Benson-commit] CVS: benson3/src stack.c,1.1,1.2 utils.c,1.13,1.14

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/src

Modified Files:
	stack.c utils.c 
Log Message:
The latest changes to the build environment

Index: stack.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/stack.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** stack.c	27 Sep 2003 18:25:52 -0000	1.1
--- stack.c	7 Oct 2003 01:11:54 -0000	1.2
***************
*** 5,10 ****
  	stack_ctx *current_ctx;
  
! 	current_ctx = (stack_ctx *)malloc(sizeof(stack_ctx));
! 	memset(current_ctx, 0, sizeof(stack_ctx));
  
  	current_ctx->max_items = max_items;
--- 5,9 ----
  	stack_ctx *current_ctx;
  
! 	current_ctx = (stack_ctx *)ibn_malloc(sizeof(stack_ctx));
  
  	current_ctx->max_items = max_items;
***************
*** 25,30 ****
  	// fixme check for error
  	if(current_ctx->first_node == NULL) {
! 		current_ctx->first_node = (snode *)malloc(snode_size);
! 		memset(current_ctx->first_node, 0, snode_size);
  		current_ctx->first_node->node_construct = item;
  	} else {
--- 24,28 ----
  	// fixme check for error
  	if(current_ctx->first_node == NULL) {
! 		current_ctx->first_node = (snode *)ibn_malloc(snode_size);
  		current_ctx->first_node->node_construct = item;
  	} else {
***************
*** 35,41 ****
  		}
  		// fixme check for error
! 		ptr->next = (snode *)malloc(snode_size);
  		ptr = ptr->next;
- 		memset(ptr, 0, snode_size);
  		ptr->node_construct = item;
  	}
--- 33,38 ----
  		}
  		// fixme check for error
! 		ptr->next = (snode *)ibn_malloc(snode_size);
  		ptr = ptr->next;
  		ptr->node_construct = item;
  	}
***************
*** 53,60 ****
  	}
  
! 	ptr = current_ctx->first_node;
  	while(ptr->next != NULL) {
  		prev_ptr = ptr;
  		ptr = ptr->next;
  	}
  	item = ptr->node_construct;
--- 50,59 ----
  	}
  
! 	prev_ptr = ptr = current_ctx->first_node;
! 	printf("%p\n", ptr);
  	while(ptr->next != NULL) {
  		prev_ptr = ptr;
  		ptr = ptr->next;
+ 		printf("%p\n", ptr);
  	}
  	item = ptr->node_construct;
***************
*** 62,66 ****
  	// fixme
  	memset(ptr, 0, sizeof(snode));
! 	free(ptr);
  
  	prev_ptr->next = NULL;
--- 61,65 ----
  	// fixme
  	memset(ptr, 0, sizeof(snode));
! 	ibn_free(ptr);
  
  	prev_ptr->next = NULL;
***************
*** 82,90 ****
  		ptr = ptr->next;
  		memset(prev_ptr, 0, sizeof(snode));
! 		free(prev_ptr);
  	}
  
  	memset(ptr, 0, sizeof(snode));
! 	free(ptr);
  
  	return GOOD;
--- 81,89 ----
  		ptr = ptr->next;
  		memset(prev_ptr, 0, sizeof(snode));
! 		ibn_free(prev_ptr);
  	}
  
  	memset(ptr, 0, sizeof(snode));
! 	ibn_free(ptr);
  
  	return GOOD;

Index: utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/utils.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** utils.c	28 Sep 2003 22:26:28 -0000	1.13
--- utils.c	7 Oct 2003 01:11:54 -0000	1.14
***************
*** 190,191 ****
--- 190,210 ----
  }
  
+ void *ibn_malloc(size_t length)
+ {
+ 	void *ptr;
+ 	if(length < 1) {
+ 		fprintf(stderr, "ibn_malloc() error: requested length (%d) < 1\n", length);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	if((ptr = malloc(length)) == 0) {
+ 		fprintf(stderr, "ibn_malloc() error: out of memory\n");
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	memset(ptr, 0, length);
+ 	return ptr;
+ }
+ 
+ void ibn_free(void *ptr)
+ {
+ 	free(ptr);
+ }