removed some unused vars

j256 · Nov 25, 2020 · a2c89dc · a2c89dc
1 parent c73b295
commit a2c89dc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/chunk.c b/chunk.c
@@ -2344,12 +2344,14 @@ void	*_dmalloc_chunk_malloc(const char *file, const unsigned int line,
 			       const unsigned int alignment)
 {
   unsigned long	needed_size;
-  int		valloc_b = 0, memalign_b = 0, fence_b = 0;
+  int		valloc_b = 0, fence_b = 0;
   char		where_buf[MAX_FILE_LENGTH + 64], disp_buf[64];
   skip_alloc_t	*slot_p;
   pnt_info_t	pnt_info;
   const char	*trans_log;
 
+  // TOTO: is alignment used here appropriately?
+
   /* counts calls to malloc */
   if (func_id == DMALLOC_FUNC_CALLOC) {
     func_calloc_c++;
@@ -2360,7 +2362,6 @@ void	*_dmalloc_chunk_malloc(const char *file, const unsigned int line,
   }
   else if (alignment > 0) {
     func_memalign_c++;
-    memalign_b = 1;
   }
   else if (func_id == DMALLOC_FUNC_NEW) {
     func_new_c++;

diff --git a/dmalloc_t.c b/dmalloc_t.c
@@ -3332,7 +3332,6 @@ static	int	check_special(void)
    * Make sure that string tokens work in the processing program.
    */
   {
-    unsigned int	old_flags = dmalloc_debug_current();
     unsigned int	new_flags;
 
     if (! silent_b) {

diff --git a/error.c b/error.c
@@ -147,8 +147,7 @@ static	char	message_str[1024];		/* message string buffer */
  */
 static	void	build_logfile_path(char *buf, const int buf_len)
 {
-  char	*bounds_p;
-  char	*path_p, *buf_p, *start_p;
+  char	*bounds_p, *path_p, *buf_p;
   int	len;
 
   if (dmalloc_logpath == NULL) {
@@ -159,7 +158,6 @@ static	void	build_logfile_path(char *buf, const int buf_len)
   buf_p = buf;
   bounds_p = buf + buf_len;
 
-  start_p = dmalloc_logpath;
   for (path_p = dmalloc_logpath; *path_p != '\0'; path_p++) {
 
     /* if we don't have to do anything special then just continue */

diff --git a/malloc.c b/malloc.c
@@ -1349,13 +1349,17 @@ char	*strndup(const char *string, const DMALLOC_SIZE max_len)
 DMALLOC_FREE_RET	free(DMALLOC_PNT pnt)
 {
   char	*file;
+#if DMALLOC_FREE_RET == int
   int	ret;
+#endif
 
   GET_RET_ADDR(file);
-  ret = dmalloc_free(file, DMALLOC_DEFAULT_LINE, pnt, DMALLOC_FUNC_FREE);
+#if DMALLOC_FREE_RET == int
+  ret =
+#endif
+    dmalloc_free(file, DMALLOC_DEFAULT_LINE, pnt, DMALLOC_FUNC_FREE);
 
-#if (defined(__STDC__) && __STDC__ == 1) || defined(__cplusplus) || defined(STDC_HEADERS)
-#else
+#if DMALLOC_FREE_RET == int
   return ret;
 #endif
 }
@@ -1380,13 +1384,17 @@ DMALLOC_FREE_RET	free(DMALLOC_PNT pnt)
 DMALLOC_FREE_RET	cfree(DMALLOC_PNT pnt)
 {
   char	*file;
+#if DMALLOC_FREE_RET == int
   int	ret;
+#endif
 
   GET_RET_ADDR(file);
-  ret = dmalloc_free(file, DMALLOC_DEFAULT_LINE, pnt, DMALLOC_FUNC_CFREE);
+#if DMALLOC_FREE_RET == int
+  ret =
+#endif
+    dmalloc_free(file, DMALLOC_DEFAULT_LINE, pnt, DMALLOC_FUNC_CFREE);
 
-#if (defined(__STDC__) && __STDC__ == 1) || defined(__cplusplus) || defined(STDC_HEADERS)
-#else
+#if DMALLOC_FREE_RET == int
   return ret;
 #endif
 }