From 8975c75c61dfc89048eb471e0de02e4b5421e9ab Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Mon, 23 Sep 2013 20:57:52 +0200 Subject: [PATCH] Update sortix/kernelinfo.cpp to current coding conventions. --- sortix/kernelinfo.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sortix/kernelinfo.cpp b/sortix/kernelinfo.cpp index 679f619f..196a1a42 100644 --- a/sortix/kernelinfo.cpp +++ b/sortix/kernelinfo.cpp @@ -22,11 +22,11 @@ *******************************************************************************/ +#include + #include #include -#include - #include "kernelinfo.h" #ifndef VERSIONSTR @@ -45,23 +45,21 @@ const char* KernelInfo(const char* req) return NULL; } -ssize_t SysKernelInfo(const char* req, char* resp, size_t resplen) +static ssize_t sys_kernelinfo(const char* req, char* resp, size_t resplen) { const char* str = KernelInfo(req); - if ( !str ) { errno = EINVAL; return -1; } + if ( !str ) + return errno = EINVAL, -1; size_t stringlen = strlen(str); if ( resplen < stringlen + 1 ) - { - errno = ERANGE; - return (ssize_t) stringlen; - } + return errno = ERANGE, (ssize_t) stringlen; strcpy(resp, str); return 0; } void Init() { - Syscall::Register(SYSCALL_KERNELINFO, (void*) SysKernelInfo); + Syscall::Register(SYSCALL_KERNELINFO, (void*) sys_kernelinfo); } } // namespace Info