Fixing up doxygen comments

[tpg/acess2.git] / Kernel / lib.c

diff --git a/Kernel/lib.c b/Kernel/lib.c
index ab64d67..cab15b3 100644 (file)
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -180,6 +180,9 @@ void itoa(char *buf, Uint num, int base, int minLength, char pad)
        if(pos==__maxlen){return pos;}\
        if(__s){__s[pos++]=ch;}else{pos++;}\
        }while(0)
+/**
+ * \brief VArg String Number Print Formatted
+ */
 int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 {
        char    c, pad = ' ';
@@ -232,7 +235,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                        pad = ' ';
                
                // - Minimum length
-               if(c == '*') {
+               if(c == '*') {  // Dynamic length
                        minSize = val;
                        val = va_arg(args, Uint);
                        c = *__format++;
@@ -270,10 +273,14 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                {
                case 'd':
                case 'i':
-                       if( (isLongLong && val >> 63) || (!isLongLong && val >> 31) ) {
+                       if( isLongLong && val >> 63 ) {
                                PUTCH('-');
                                val = -val;
                        }
+                       else if( !isLongLong && val >> 31 ) {
+                               PUTCH('-');
+                               val = -(Sint32)val;
+                       }
                        itoa(p, val, 10, minSize, pad);
                        goto printString;
                case 'u':
@@ -296,7 +303,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                
                // String - Null Terminated Array
                case 's':
-                       p = (char*)(Uint)val;
+                       p = (char*)(tVAddr)val;
                printString:
                        if(!p)          p = "(null)";
                        len = strlen(p);
@@ -306,9 +313,8 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                        break;
                
                case 'C':       // Non-Null Terminated Character Array
-                       p = (char*)(Uint)val;
+                       p = (char*)(tVAddr)val;
                        if(!p)  goto printString;
-                       //while(minSize--)      PUTCH(*p++);
                        while(minSize--)        PUTCH(*p++);
                        break;
                
@@ -489,7 +495,6 @@ char **str_split(const char *__str, char __ch)
        {
                if(__str[i] == __ch) {
                        *start++ = '\0';
-                       Log_Debug("Lib", "str_split: ret[%i] = '%s'", j-1, ret[j-1]);
                        ret[j++] = start;
                }
                else {
@@ -498,10 +503,6 @@ char **str_split(const char *__str, char __ch)
        }
        *start = '\0';
        ret[j] = NULL;
-       Log_Debug("Lib", "str_split: ret[%i] = '%s'", j-1, ret[j-1]);
-       
-       for( j = 0; j < len; j++ )
-               Log_Debug("Lib", "str_split: ret[%i] = '%s'", j, ret[j]);
        
        return ret;
 }
@@ -664,7 +665,7 @@ Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year)
                ) && month > 1) // Leap year and after feb
                stamp += 3600*24;
        
-       stamp += ((365*4+1) * ((year-2000)&~3)) * 3600*24;      // Foour Year Segments
+       stamp += ((365*4+1) * ((year-2000)&~3)) * 3600*24;      // Four Year Segments
        stamp += ((year-2000)&3) * 365*3600*24; // Inside four year segment
        stamp += UNIX_TO_2K;
        
@@ -686,13 +687,18 @@ Uint rand(void)
        return giRandomState;
 }
 
-/// \name Memory Validation
-/// \{
+/* *
+ * \name Memory Validation
+ * \{
+ */
 /**
  * \brief Checks if a string resides fully in valid memory
  */
 int CheckString(char *String)
 {
+       if( !MM_GetPhysAddr( (tVAddr)String ) )
+               return 0;
+       
        // Check 1st page
        if( MM_IsUser( (tVAddr)String ) )
        {
@@ -750,7 +756,9 @@ int CheckMem(void *Mem, int NumBytes)
        }
        return 0;
 }
-/// \}
+/* *
+ * \}
+ */
 
 /**
  * \brief Search a string array for \a Needle