Removed unused functions and variables.

2009-02-18  David Smith  <dsmith@redhat.com>

	* io.c (_stp_log): Removed unused function.
	* map.c (_stp_cmp): Replace _stp_log() with dbug().
	* mempool.c (_stp_mempool_resize): Removed unused function.
	* print.c (next_fmt): Removed unused function.
	* procfs.c: Removed unused variable '_stp_num_procfs_files'.
	* regs.c (_stp_ret_addr): Removed unused function.
	* string.c (_stp_text_str): Removed unused variable 'len'.
	* string.h: Removed unused variable '_stdout_' and function
	declaration for deleted function '_stp_vsprintf'.
	* sym.c: Removed unused variables.
	* unwind.c (_stp_create_unwind_hdr): Removed unused function.

2009-02-18  David Smith  <dsmith@redhat.com>

	* control.c: Removed unused variable '_stp_current_buffers'.
	* procfs.c (_stp_set_buffers): Removed unused function.
	(_stp_register_ctl_channel_fs): Removed unused variables and
	label.
	* symbols.c (u32_swap): Removed unused function.
	(generic_swap): Ditto.
	(_stp_sort): Ditto.
	(_stp_section_is_interesting): Ditto.
	* transport.c (_stp_transport_init): Removed unused variable
	'ret'.

1 files changed, 1 insertions, 94 deletions

diff --git a/runtime/transport/symbols.c b/runtime/transport/symbols.c
index b9458ada..a329effe 100644
--- a/runtime/transport/symbols.c
+++ b/runtime/transport/symbols.c
@@ -1,26 +1,18 @@
 /* -*- linux-c -*- 
  * symbols.c - stp symbol and module functions
  *
- * Copyright (C) Red Hat Inc, 2006-2008
+ * Copyright (C) Red Hat Inc, 2006-2009
  *
  * This file is part of systemtap, and is free software.  You can
  * redistribute it and/or modify it under the terms of the GNU General
  * Public License (GPL); either version 2, or (at your option) any
  * later version.
- *
- * The u32_swap(), generic_swap(), and sort() functions were adapted from
- * lib/sort.c of kernel 2.6.22-rc5. It was written by Matt Mackall.
  */
 
 #ifndef _STP_SYMBOLS_C_
 #define _STP_SYMBOLS_C_
 #include "../sym.h"
 
-
-
-static void _stp_create_unwind_hdr(struct _stp_module *m);
-
-
 static void _stp_do_relocation(const char __user *buf, size_t count)
 {
   struct _stp_msg_relocation msg;
@@ -68,89 +60,4 @@ static void _stp_do_relocation(const char __user *buf, size_t count)
     } /* loop over modules */
 }
 
-
-static void u32_swap(void *a, void *b, int size)
-{
-	u32 t = *(u32 *)a;
-	*(u32 *)a = *(u32 *)b;
-	*(u32 *)b = t;
-}
-
-static void generic_swap(void *a, void *b, int size)
-{
-  char *aa = a;
-  char *bb = b;
-	do {
-          char t = *aa;
-          *aa++ = *bb;
-          *bb++ = t;
-	} while (--size > 0);
-}
-
-/**
- * sort - sort an array of elements
- * @base: pointer to data to sort
- * @num: number of elements
- * @size: size of each element
- * @cmp_func: pointer to comparison function
- * @swap_func: pointer to swap function or NULL
- *
- * This function does a heapsort on the given array. You may provide a
- * swap function optimized to your element type.
- *
- * Sorting time is O(n log n) both on average and worst-case. While
- * qsort is about 20% faster on average, it suffers from exploitable
- * O(n*n) worst-case behavior and extra memory requirements that make
- * it less suitable for kernel use.
-*/
-static void _stp_sort(void *_base, size_t num, size_t size,
-	       int (*cmp_func) (const void *, const void *), void (*swap_func) (void *, void *, int size))
-{
-        char *base = (char*) _base;
-	/* pre-scale counters for performance */
-	int i = (num / 2 - 1) * size, n = num * size, c, r;
-
-	if (!swap_func)
-		swap_func = (size == 4 ? u32_swap : generic_swap);
-
-	/* heapify */
-	for (; i >= 0; i -= size) {
-		for (r = i; r * 2 + size < n; r = c) {
-			c = r * 2 + size;
-			if (c < n - size && cmp_func(base + c, base + c + size) < 0)
-				c += size;
-			if (cmp_func(base + r, base + c) >= 0)
-				break;
-			swap_func(base + r, base + c, size);
-		}
-	}
-
-	/* sort */
-	for (i = n - size; i >= 0; i -= size) {
-		swap_func(base, base + i, size);
-		for (r = 0; r * 2 + size < i; r = c) {
-			c = r * 2 + size;
-			if (c < i - size && cmp_func(base + c, base + c + size) < 0)
-				c += size;
-			if (cmp_func(base + r, base + c) >= 0)
-				break;
-			swap_func(base + r, base + c, size);
-		}
-	}
-}
-
-/* filter out section names we don't care about */
-static int _stp_section_is_interesting(const char *name)
-{
-	int ret = 1;
-	if (!strncmp("__", name, 2)
-	    || (!strncmp(".note", name, 5) 
-		&& strncmp(".note.gnu.build-id", name, 18))
-	    || !strncmp(".gnu", name, 4)
-	    || !strncmp(".mod", name, 4))
-		ret = 0;
-	return ret;
-}
-
-
 #endif /* _STP_SYMBOLS_C_ */