clean up some headers

Author: mateoconlechuga

examples/hello_world/src/main.c

@@ -13,8 +13,6 @@ int main(void)
     /* Waits for a key */
     while (!os_GetCSC());
 
-    exit(0);
-
     /* Return 0 for success */
     return 0;
 }

src/std/ctype.h

@@ -1,30 +1,41 @@
 #ifndef CTYPE_H
 #define CTYPE_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <cdefs.h>
+
+__BEGIN_DECLS
 
 #define TRUE  1
 #define FALSE 0
 
 int isalnum(int c);
+
 int isalpha(int c);
+
 int iscntrl(int c);
+
 int isdigit(int c);
+
 int isgraph(int c);
+
 int islower(int c);
+
 int isprint(int c);
+
 int ispunct(int c);
+
 int isspace(int c);
+
 int isupper(int c);
+
 int tolower(int c);
+
 int toupper(int c);
+
 int isascii(int c);
+
 int isxdigit(int c);
 
-#ifdef __cplusplus
-}
-#endif
+__END_DECLS
 
 #endif

src/std/errno.h

@@ -1,15 +1,12 @@
-/*
- *  Copyright (C) 1999-2008 by  Zilog, Inc.
- *  All Rights Reserved
- *  Modified by Matt "MateoConLechuga" Waltz for TI84+CE platform
- */
 #ifndef ERRNO_H
 #define ERRNO_H
 
-#define ERR_NOR 	1	/* read not allowed for file */
-#define ERR_NOW 	2	/* write not allowed for file */
-#define ERR_IO		3	/* io error */
-#define EDOM		4	/* domain error */
-#define ERANGE		5	/* range error */
+#define EPERM       1   /* permission error */
+#define EINVAL      2   /* invalid argument */
+#define EIO         3   /* io error */
+#define EDOM        4   /* math domain error */
+#define ERANGE      5   /* math range error */
+
 extern int errno;
+
 #endif

src/std/setjmp.h

@@ -1,21 +1,15 @@
-/*
- *  Copyright (C) 1999-2008 by  Zilog, Inc.
- *  All Rights Reserved
- */
-#ifndef __SETJMP_H
-#define __SETJMP_H
+#ifndef _SETJMP_H
+#define _SETJMP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <cdefs.h>
 
-typedef unsigned char jmp_buf[12];
+__BEGIN_DECLS
 
-int setjmp(jmp_buf env);
-void longjmp(jmp_buf env, int val);
+typedef unsigned char __jmp_buf[12];
 
-#ifdef __cplusplus
-}
-#endif
+int setjmp(__jmp_buf env);
+void longjmp(__jmp_buf env, int val) __attribute__((noreturn));
+
+__END_DECLS
 
 #endif

src/std/shared/bsearch.c

@@ -24,11 +24,8 @@
 *	nothing
 *
 *************************************************/
-void *bsearch(void *keyp,
-              void *ptr,
-              size_t num,
-              size_t width,
-              int (*comp)(void *,void *))
+void *bsearch(void *keyp, void *ptr, size_t num, size_t width,
+              int (*comp)(const void *, const void *))
 {
   char *key = keyp;
   char *base = ptr;

src/std/shared/fpdata.c

@@ -40,10 +40,8 @@ struct stk {
   char *r;
 };
 
-void qsort(     void *ptr,
-		size_t nel,
-		size_t size,
-                int (*compar)(void *,void *))
+void qsort(void *ptr, size_t nel, size_t size,
+           int (*compar)(const void *, const void *))
 {
   char *base = ptr;
   char *i;

src/std/shared/qsort.c

@@ -1,4 +1,3 @@
-; int rand(void);
 	assume	adl=1
 
 	public _rand

src/std/shared/rand.src

@@ -26,11 +26,13 @@
 *    the value of the number
 *
 *************************************************/
-long strtol(const char *cp,char **endptr,int base)
+long strtol(const char *__restrict nptr,
+            char **__restrict endptr, int base)
 {
-  register long sum,psum;
-  register char sign;
-  register int radix = base;
+  long sum,psum;
+  char sign;
+  int radix = base;
+  char *cp = (char*)nptr;
   char digit;
 
   while (isspace(*cp))

src/std/shared/strtol.c

@@ -15,20 +15,22 @@
 * strtoul - string to unsigned long conversion
 *
 * Inputs:
-*	cp - pointer to the character string
+*	nptr - pointer to the character string
 *	endptr - place to put ptr to first invalid character
 *	base - radix
 *
 * Returns:
 *	the value of the number
 *
 *************************************************/
-unsigned long strtoul(char * cp,char ** endptr,int base)
+unsigned long strtoul(const char *__restrict nptr,
+                      char **__restrict endptr, int base)
 {
-  register unsigned long sum,psum;
-  register unsigned char sign;
-  register unsigned char radix = base;
-  register unsigned char digit;
+  unsigned long sum, psum;
+  unsigned char sign;
+  unsigned char digit;
+  unsigned char radix = base;
+  char *cp = (char*)nptr;
 
   while (isspace(*cp))
     ++cp;

src/std/shared/strtoul.c

@@ -13,11 +13,11 @@
 #include <stddef.h>
 #include <math.h>
 #include <errno.h>
-//#include <float.h>
 
-double strtod(const char * str,char ** endptr)
+double strtod(const char *__restrict nptr,
+              char **__restrict endptr)
 {
-    return strtof(str, endptr);
+    return strtof(nptr, endptr);
 }
 
 /*************************************************
@@ -33,7 +33,8 @@ double strtod(const char * str,char ** endptr)
 *	the value of the number
 *
 *************************************************/
-float strtof(const char * str,char ** endptr)
+float strtof(const char *__restrict nptr,
+             char **__restrict endptr)
 {
   union
   {
@@ -44,6 +45,7 @@ float strtof(const char * str,char ** endptr)
   int exp = 0;
   signed char sign = 1;
   signed char exp_sign = 1;
+  char *str = (char*)nptr;
 
   while (isspace(*str))
     ++str;

src/std/static/strtod.c

@@ -3,10 +3,9 @@
 
 #include <stdarg.h>
 #include <format.h>
+#include <cdefs.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 #ifndef SIZE_T_DEFINED
 #define SIZE_T_DEFINED
@@ -31,13 +30,16 @@ typedef __SIZE_TYPE__ size_t;
 #define SEEK_SET  0
 #endif
 
-int printf(const char *format, ...);
-int sprintf(char *s, const char *format, ...);
-int vprintf(const char *format, va_list arg);
-int vsprintf(char *s, const char *format, va_list arg);
+int printf(const char *__restrict format, ...);
 
-#ifdef __cplusplus
-}
-#endif
+int sprintf(char *__restrict str,
+            const char *__restrict format, ...);
+
+int vprintf(const char *__restrict format, va_list __arg);
+
+int vsprintf(char *__restrict str, const char *__restrict format,
+             va_list __arg);
+
+__END_DECLS
 
 #endif