Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 930)
+++ trunk/src/buffer.c	(revision 931)
@@ -525,222 +525,11 @@
  * into the buffer.
  */
 
-/* Figuring out which library entry is the one we want is a little
-   tricky.  For file-based footprints, it's just a matter of finding
-   the first match in the search list.  For m4-based footprints you
-   need to know what magic to pass to the m4 functions.  Fortunately,
-   the footprint needed is determined when we build the m4 libraries
-   and stored as a comment in the description, so we can search for
-   that to find the magic we need.  We use a hash to store the
-   corresponding footprints and pointers to the library tree so we can
-   quickly find the various bits we need to load a given
-   footprint.  */
-
-typedef struct {
-  char *footprint;
-  int footprint_allocated;
-  int menu_idx;
-  int entry_idx;
-} FootprintHashEntry;
-
-static FootprintHashEntry *footprint_hash = 0;
-int footprint_hash_size = 0;
-
-void
-clear_footprint_hash ()
-{
-  int i;
-  if (!footprint_hash)
-    return;
-  for (i=0; i<footprint_hash_size; i++)
-    if (footprint_hash[i].footprint_allocated)
-      free (footprint_hash[i].footprint);
-  free (footprint_hash);
-  footprint_hash = NULL;
-  footprint_hash_size = 0;
-}
-
-/* Used to sort footprint pointer entries.  Note we include the index
-   numbers so that same-named footprints are sorted by the library
-   search order.  */
-static int
-footprint_hash_cmp (const void *va, const void *vb)
-{
-  int i;
-  FootprintHashEntry *a = (FootprintHashEntry *)va;
-  FootprintHashEntry *b = (FootprintHashEntry *)vb;
-
-  i = strcmp (a->footprint, b->footprint);
-  if (i == 0)
-    i = a->menu_idx - b->menu_idx;
-  if (i == 0)
-    i = a->entry_idx - b->entry_idx;
-  return i;
-}
-
-void
-make_footprint_hash ()
-{
-  int i, j;
-  char *fp;
-  int num_entries = 0;
-
-  clear_footprint_hash ();
-
-  for (i=0; i<Library.MenuN; i++)
-    for (j=0; j<Library.Menu[i].EntryN; j++)
-      num_entries ++;
-  footprint_hash = (FootprintHashEntry *)malloc (num_entries * sizeof(FootprintHashEntry));
-  num_entries = 0;
-
-  /* There are two types of library entries.  The file-based types
-     have a Template of (char *)-1 and the AllocatedMemory is the full
-     path to the footprint file.  The m4 ones have the footprint name
-     in brackets in the description.  */
-  for (i=0; i<Library.MenuN; i++)
-    {
-#ifdef DEBUG
-  printf("In make_footprint_hash, looking for footprints in %s\n", 
-	 Library.Menu[i].directory);
-#endif
-
-    for (j=0; j<Library.Menu[i].EntryN; j++)
-	{
-	  footprint_hash[num_entries].menu_idx = i;
-	  footprint_hash[num_entries].entry_idx = j;
-/*
-	  if (Library.Menu[i].Entry[j].Template == (char *) -1) 
-	    {
-        file */
-
-#ifdef DEBUG
-/*	      printf(" ... Examining file %s\n", Library.Menu[i].Entry[j].AllocatedMemory); */
-#endif
-	      fp = strrchr (Library.Menu[i].Entry[j].AllocatedMemory, '/');
-
-	      if (!fp)
-		fp = strrchr (Library.Menu[i].Entry[j].AllocatedMemory, '\\');
-
-	      if (fp)
-		fp ++;
-	      else 
-		fp = Library.Menu[i].Entry[j].AllocatedMemory;
-
-#ifdef DEBUG
-/* 	      printf(" ... found file footprint %s\n",  fp); */
-#endif
-	        
-	      footprint_hash[num_entries].footprint = fp;
-	      footprint_hash[num_entries].footprint_allocated = 0;
-	  num_entries ++;
-	}
-    }
-
-  footprint_hash_size = num_entries;
-  qsort (footprint_hash, num_entries, sizeof(footprint_hash[0]), footprint_hash_cmp);
-/*
-#ifdef DEBUG
-  printf("       found footprints:  \n");
-  for (i=0; i<num_entries; i++)
-    printf("[%s]\n", footprint_hash[i].footprint);
-#endif
-*/
-}
-
-FootprintHashEntry *
-search_footprint_hash (const char *footprint)
-{
-  int i, min, max, c;
-
-  /* Standard binary search */
-
-  min = -1;
-  max = footprint_hash_size;
-
-  while (max - min > 1)
-    {
-      i = (min+max)/2;
-      c = strcmp (footprint, footprint_hash[i].footprint);
-      if (c < 0)
-	max = i;
-      else if (c > 0)
-	min = i;
-      else
-	{
-	  /* We want to return the first match, not just any match.  */
-	  while (i > 0
-		 && strcmp (footprint, footprint_hash[i-1].footprint) == 0)
-	    i--;
-	  return & footprint_hash[i];
-	}
-    }
-  return NULL;
-}
-
 /* Returns zero on success, non-zero on error.  */
 int
 LoadFootprintByName (BufferTypePtr Buffer, char *Footprint)
 {
-  int i;
-  FootprintHashEntry *fpe;
-  LibraryMenuType *menu;
-  LibraryEntryType *entry;
-  char *with_fp = NULL;
-
-  if (!footprint_hash)
-    make_footprint_hash ();
-
-  fpe = search_footprint_hash (Footprint);
-  if (!fpe)
-    {
-      with_fp = Concat (Footprint, ".fp", NULL);
-      fpe = search_footprint_hash (with_fp);
-      if (fpe)
-	Footprint = with_fp;
-    }
-  if (!fpe)
-    {
-      Message("Unable to load footprint %s\n", Footprint);
-      return 1;
-    }
-
-  menu = & Library.Menu[fpe->menu_idx];
-  entry = & menu->Entry[fpe->entry_idx];
-
-      i = LoadElementToBuffer (Buffer, entry->AllocatedMemory);
-      if (with_fp)
-	free (with_fp);
-      return i ? 0 : 1;
-
-#ifdef DEBUG
-  {
-    int j;
-    printf("Library search paths: %s\n", Settings.LibrarySearchPaths);
-
-    printf("Library:\n");
-    for (i=0; i<Library.MenuN; i++)
-      {
-	printf("  [%02d] Name: %s\n", i, Library.Menu[i].Name);
-	printf("       Dir:  %s\n", Library.Menu[i].directory);
-	printf("       Sty:  %s\n", Library.Menu[i].Style);
-	for (j=0; j<Library.Menu[i].EntryN; j++)
-	  {
-	    printf("       [%02d] E: %s\n", j, Library.Menu[i].Entry[j].ListEntry);
-	    if (Library.Menu[i].Entry[j].Template == (char *) -1)
-	      printf("            A: %s\n", Library.Menu[i].Entry[j].AllocatedMemory);
-	    else
-	      {
-		printf("            T: %s\n", Library.Menu[i].Entry[j].Template);
-		printf("            P: %s\n", Library.Menu[i].Entry[j].Package);
-		printf("            V: %s\n", Library.Menu[i].Entry[j].Value);
-		printf("            D: %s\n", Library.Menu[i].Entry[j].Description);
-	      }
-	    if (j == 10)
-	      break;
-	  }
-      }
-  }
-#endif
+  return !LoadElementToBuffer (Buffer, Footprint);
 }