* grub-core/lib/posix_wrap/string.h (memcpy) [GRUB_UTIL]:

	New inline function.
	* grub-core/lib/libgcrypt_wrap/cipher_wrap.h (memcpy) [GRUB_UTIL]:
	Likewise.
	(memset) [GRUB_UTIL]: Likewise.
	(memcmp) [GRUB_UTIL]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 782da923ef7cb3b11a95230b8fe8a97d70e11adc..579f510b0e1166f19694d51372e14843bf4eca43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/posix_wrap/string.h (memcpy) [GRUB_UTIL]:
+       New inline function.
+       * grub-core/lib/libgcrypt_wrap/cipher_wrap.h (memcpy) [GRUB_UTIL]:
+       Likewise.
+       (memset) [GRUB_UTIL]: Likewise.
+       (memcmp) [GRUB_UTIL]: Likewise.
+
 2011-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/misc.h (grub_memcpy): Declare grub_memcpy with static

diff --git a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
index 59febaeb5ed3755e741420b37583e42b3030ef8b..0141400fc235406a037821460a65fc8c7bcd1580 100644 (file)
--- a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
+++ b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
@@ -87,6 +87,25 @@ fips_mode (void)
   return 0;
 }
 
-#define memset grub_memset
+#ifdef GRUB_UTIL
+static inline void *
+memcpy (void *dest, const void *src, grub_size_t n)
+{
+  return grub_memcpy (dest, src, n);
+}
+
+static inline void *
+memset (void *s, int c, grub_size_t n)
+{
+  return grub_memset (s, c, n);
+}
+
+static inline int
+memcmp (const void *s1, const void *s2, grub_size_t n)
+{
+  return grub_memcmp (s1, s2, n);
+}
+#endif
+
 
 #endif

diff --git a/grub-core/lib/posix_wrap/string.h b/grub-core/lib/posix_wrap/string.h
index 4224836e2f017af14c110e180e00b8d02ce0611c..f38c97ba4e980114c439d85b7a163b163a482cfd 100644 (file)
--- a/grub-core/lib/posix_wrap/string.h
+++ b/grub-core/lib/posix_wrap/string.h
@@ -39,4 +39,12 @@ strcasecmp (const char *s1, const char *s2)
   return grub_strcasecmp (s1, s2);
 }
 
+#ifdef GRUB_UTIL
+static inline void *
+memcpy (void *dest, const void *src, grub_size_t n)
+{
+  return grub_memcpy (dest, src, n);
+}
+#endif
+
 #endif