use guards for unlikely cases

1 files changed, 7 insertions, 8 deletions

diff --git a/vespalib/src/vespa/vespalib/util/memory.h b/vespalib/src/vespa/vespalib/util/memory.h
index 51a89a487e1..f2ed6ccae3e 100644
--- a/vespalib/src/vespa/vespalib/util/memory.h
+++ b/vespalib/src/vespa/vespalib/util/memory.h
@@ -12,25 +12,24 @@
 namespace vespalib {
 
 inline void *memcpy_safe(void *dest, const void *src, size_t n) noexcept {
-    if (n > 0) [[likely]] {
-        memcpy(dest, src, n);
+    if (n == 0) [[unlikely]] {
+        return dest;
     }
-    return dest;
+    return memcpy(dest, src, n);
 }
 
 inline void *memmove_safe(void *dest, const void *src, size_t n) noexcept {
-    if (n > 0) [[likely]] {
-        memmove(dest, src, n);
+    if (n == 0) [[unlikely]] {
+        return dest;
     }
-    return dest;
+    return memmove(dest, src, n);
 }
 
 inline int memcmp_safe(const void *s1, const void *s2, size_t n) noexcept {
     if (n == 0) [[unlikely]] {
         return 0;
-    } else [[likely]] {
-        return memcmp(s1, s2, n);
     }
+    return memcmp(s1, s2, n);
 }
 
 /**