From 998208d4d367f6bf93f09fe1c6431c8327ef1f18 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Fri, 20 Jun 2014 15:22:54 +0200 Subject: [PATCH] Update libc/string/memcmp.cpp to current coding conventions. --- libc/string/memcmp.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libc/string/memcmp.cpp b/libc/string/memcmp.cpp index 5769ae89..1e25cbfc 100644 --- a/libc/string/memcmp.cpp +++ b/libc/string/memcmp.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2014. This file is part of the Sortix C Library. @@ -22,16 +22,18 @@ *******************************************************************************/ -#include #include -extern "C" int memcmp(const void* a, const void* b, size_t size) +extern "C" int memcmp(const void* a_ptr, const void* b_ptr, size_t size) { - const uint8_t* buf1 = (const uint8_t*) a; - const uint8_t* buf2 = (const uint8_t*) b; + const unsigned char* a = (const unsigned char*) a_ptr; + const unsigned char* b = (const unsigned char*) b_ptr; for ( size_t i = 0; i < size; i++ ) { - if ( buf1[i] != buf2[i] ) { return (int)(buf1[i]) - (int)(buf2[i]); } + if ( a[i] < b[i] ) + return -1; + if ( a[i] > b[i] ) + return +1; } return 0; }