[syslinux:firmware] zonelist: rename syslinux_memmap_find()...

[syslinux-bot for Matt Fleming]

Commit-ID:  6252212849d945450310248b656dfb6f13f5de48
Gitweb:     http://www.syslinux.org/commit/6252212849d945450310248b656dfb6f13f5de48
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Mon, 15 Jul 2013 17:31:48 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Wed, 17 Jul 2013 18:10:42 +0100

zonelist: rename syslinux_memmap_find()...

to syslinux_memmap_find_type(), which more accurately reflects its
function and frees up the old name for another use.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 com32/include/syslinux/movebits.h | 6 +++---
 com32/lib/syslinux/shuffle_pm.c   | 2 +-
 com32/lib/syslinux/shuffle_rm.c   | 4 ++--
 com32/lib/syslinux/zonelist.c     | 6 +++---
 com32/mboot/map.c                 | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/com32/include/syslinux/movebits.h b/com32/include/syslinux/movebits.h
index 8bcdf3e..5023acc 100644
--- a/com32/include/syslinux/movebits.h
+++ b/com32/include/syslinux/movebits.h
@@ -78,9 +78,9 @@ int syslinux_memmap_largest(struct syslinux_memmap *list,
 			    addr_t * start, addr_t * len);
 void syslinux_free_memmap(struct syslinux_memmap *list);
 struct syslinux_memmap *syslinux_dup_memmap(struct syslinux_memmap *list);
-int syslinux_memmap_find(struct syslinux_memmap *list,
-			 enum syslinux_memmap_types type,
-			 addr_t * start, addr_t * len, addr_t align);
+int syslinux_memmap_find_type(struct syslinux_memmap *list,
+			      enum syslinux_memmap_types type,
+			      addr_t * start, addr_t * len, addr_t align);
 
 /* Debugging functions */
 #ifdef DEBUG
diff --git a/com32/lib/syslinux/shuffle_pm.c b/com32/lib/syslinux/shuffle_pm.c
index 5e3183b..96c055c 100644
--- a/com32/lib/syslinux/shuffle_pm.c
+++ b/com32/lib/syslinux/shuffle_pm.c
@@ -52,7 +52,7 @@ int syslinux_shuffle_boot_pm(struct syslinux_movelist *fraglist,
 
     regstub = 0x800;		/* Locate anywhere above this point */
     stublen = sizeof handoff_code;
-    rv = syslinux_memmap_find(tmap, SMT_FREE, &regstub, &stublen, 1);
+    rv = syslinux_memmap_find_type(tmap, SMT_FREE, &regstub, &stublen, 1);
     syslinux_free_memmap(tmap);
     if (rv)
 	return -1;
diff --git a/com32/lib/syslinux/shuffle_rm.c b/com32/lib/syslinux/shuffle_rm.c
index a7d16d6..9935f4c 100644
--- a/com32/lib/syslinux/shuffle_rm.c
+++ b/com32/lib/syslinux/shuffle_rm.c
@@ -105,7 +105,7 @@ int syslinux_shuffle_boot_rm(struct syslinux_movelist *fraglist,
      */
     regstub = 0x800;
     stublen = sizeof handoff_code;
-    rv = syslinux_memmap_find(tmap, SMT_FREE, &regstub, &stublen, 16);
+    rv = syslinux_memmap_find_type(tmap, SMT_FREE, &regstub, &stublen, 16);
 
     if (rv || (regstub > 0x100000 - sizeof handoff_code)) {
 	/*
@@ -116,7 +116,7 @@ int syslinux_shuffle_boot_rm(struct syslinux_movelist *fraglist,
 	 */
 	regstub = 0x510;	/* Try the 0x5xx segment... */
 	stublen = sizeof handoff_code;
-	rv = syslinux_memmap_find(tmap, SMT_FREE, &regstub, &stublen, 16);
+	rv = syslinux_memmap_find_type(tmap, SMT_FREE, &regstub, &stublen, 16);
 
 	if (!rv && (regstub > 0x100000 - sizeof handoff_code))
 	    rv = -1;		/* No acceptable memory found */
diff --git a/com32/lib/syslinux/zonelist.c b/com32/lib/syslinux/zonelist.c
index 7034c4b..d1510d2 100644
--- a/com32/lib/syslinux/zonelist.c
+++ b/com32/lib/syslinux/zonelist.c
@@ -214,9 +214,9 @@ int syslinux_memmap_largest(struct syslinux_memmap *list,
  * a certain minimum size, with an optional starting address.
  * The input values of start and len are used as minima.
  */
-int syslinux_memmap_find(struct syslinux_memmap *list,
-			 enum syslinux_memmap_types type,
-			 addr_t * start, addr_t * len, addr_t align)
+int syslinux_memmap_find_type(struct syslinux_memmap *list,
+			      enum syslinux_memmap_types type,
+			      addr_t * start, addr_t * len, addr_t align)
 {
     addr_t min_start = *start;
     addr_t min_len = *len;
diff --git a/com32/mboot/map.c b/com32/mboot/map.c
index 99add30..84f3b20 100644
--- a/com32/mboot/map.c
+++ b/com32/mboot/map.c
@@ -53,7 +53,7 @@ addr_t map_data(const void *data, size_t len, size_t align, int flags)
     addr_t pad = (flags & MAP_NOPAD) ? 0 : -len & (align - 1);
     addr_t xlen = len + pad;
 
-    if (syslinux_memmap_find(amap, SMT_FREE, &start, &xlen, align) ||
+    if (syslinux_memmap_find_type(amap, SMT_FREE, &start, &xlen, align) ||
 	syslinux_add_memmap(&amap, start, len + pad, SMT_ALLOC) ||
 	syslinux_add_movelist(&ml, start, (addr_t) data, len) ||
 	(pad && syslinux_add_memmap(&mmap, start + len, pad, SMT_ZERO))) {