Add lib.csv that may be used to generate C library symbol tables

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5072 7fd9a85b-ad96-42d3-883c-3090e2eb8679

66 files changed, 276 insertions, 70 deletions

diff --git a/nuttx/include/libgen.h b/nuttx/include/libgen.h
index e659483768..0d42dc7782 100644
--- a/nuttx/include/libgen.h
+++ b/nuttx/include/libgen.h
@@ -55,8 +55,8 @@ extern "C" {
 #define EXTERN extern
 #endif
 
-EXTERN char *basename(char *path);
-EXTERN char *dirname(char *path);
+EXTERN FAR char *basename(FAR char *path);
+EXTERN FAR char *dirname(FAR char *path);
 
 #undef EXTERN
 #ifdef __cplusplus
diff --git a/nuttx/include/netinet/ether.h b/nuttx/include/netinet/ether.h
index f11fef6dbf..69b8fbba67 100644
--- a/nuttx/include/netinet/ether.h
+++ b/nuttx/include/netinet/ether.h
@@ -63,7 +63,7 @@ extern "C" {
 #define EXTERN extern
 #endif
 
-EXTERN char *ether_ntoa(const struct ether_addr *addr);
+EXTERN FAR char *ether_ntoa(FAR const struct ether_addr *addr);
 EXTERN struct ether_addr *ether_aton(const char *asc);
 EXTERN int ether_ntohost(char *hostname, const struct ether_addr *addr);
 EXTERN int ether_hostton(const char *hostname, struct ether_addr *addr);
diff --git a/nuttx/lib/README.txt b/nuttx/lib/README.txt
index 62e2fcce2e..7de8580485 100644
--- a/nuttx/lib/README.txt
+++ b/nuttx/lib/README.txt
@@ -45,3 +45,38 @@ directory:
 
  misc       - Nonstandard "glue" logic, debug.h, crc32.h, dirent.h
 
+Library Database
+================
+
+Information about functions available in the NuttX C library information is
+maintained in a database.  That "database" is implemented as a simple comma-
+separated-value file, lib.csv.  Most spreadsheets programs will accept this
+format and can be used to maintain the library database.
+
+This library database will (eventually) be used to generate symbol library
+symbol table information that can be exported to external applications.
+
+The format of the CSV file for each line is:
+
+  Field 1: Function name
+  Field 2: The header file that contains the function prototype
+  Field 3: Condition for compilation
+  Field 4: The type of function return value.
+  Field 5 - N+5: The type of each of the N formal parameters of the function
+
+Each type field has a format as follows:
+
+  type name:
+        For all simpler types
+  formal type | actual type: 
+        For array types where the form of the formal (eg. int parm[2])
+        differs from the type of actual passed parameter (eg. int*).  This
+        is necessary because you cannot do simple casts to array types.
+  formal type | union member actual type | union member fieldname:
+        A similar situation exists for unions.  For example, the formal
+        parameter type union sigval -- You cannot cast a uintptr_t to
+        a union sigval, but you can cast to the type of one of the union
+        member types when passing the actual paramter.  Similarly, we
+        cannot cast a union sigval to a uinptr_t either.  Rather, we need
+        to cast a specific union member fieldname to uintptr_t.
+
diff --git a/nuttx/lib/lib.csv b/nuttx/lib/lib.csv
new file mode 100644
index 0000000000..a55d5dbfe4
--- /dev/null
+++ b/nuttx/lib/lib.csv
@@ -0,0 +1,170 @@
+"_inet_ntoa","#include <arpa/inet.h>","#if !defined(CONFIG_NET_IPv6) && !defined(CONFIG_CAN_PASS_STRUCTS)","FAR char","in_addr_t"
+"abort","#include <stdlib.h>","","void"
+"abs","#include <stdlib.h>","","int","int"
+"asprintf","#include <stdio.h>","","int","FAR char **","const char *","..."
+"avsprintf","#include <stdio.h>","","int","FAR char **","const char *","va_list"
+"b16atan2","#include <fixedmath.h>","","b16_t","b16_t","b16_t"
+"b16cos","#include <fixedmath.h>","","b16_t","b16_t"
+"b16divb16","#include <fixedmath.h>","","b16_t","b16_t","b16_t"
+"b16mulb16","#include <fixedmath.h>","","b16_t","b16_t","b16_t"
+"b16sin","#include <fixedmath.h>","","b16_t","b16_t"
+"b16sqr","#include <fixedmath.h>","","b16_t","b16_t"
+"basename","#include <libgen.h>","","FAR char","FAR char *"
+"cfgetspeed","#include <termios.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","speed_t","FAR const struct termios *"
+"cfsetspeed","#include <termios.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","FAR struct termios *","speed_t"
+"chdir","#include <unistd.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)","int","FAR const char *"
+"crc32","#include <crc32.h>","","uint32_t","FAR const uint8_t *","size_t"
+"crc32part","#include <crc32.h>","","uint32_t","FAR const uint8_t *","size_t","uint32_t"
+"dbg","#include <debug.h>","#if !defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG)","int","const char *","..."
+"dbg_enable","#include <debug.h>","#ifdef CONFIG_DEBUG_ENABLE","void","bool"
+"dirname","#include <libgen.h>","","FAR char","FAR char *"
+"dq_addafter","#include <queue.h>","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
+"dq_addbefore","#include <queue.h>","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
+"dq_addfirst","#include <queue.h>","","void","FAR dq_entry_t *","dq_queue_t *"
+"dq_addlast","#include <queue.h>","","void","FAR dq_entry_t *","dq_queue_t *"
+"dq_rem","#include <queue.h>","","void","FAR dq_entry_t *","dq_queue_t *"
+"dq_remfirst","#include <queue.h>","","FAR dq_entry_t","dq_queue_t *"
+"dq_remlast","#include <queue.h>","","FAR dq_entry_t","dq_queue_t *"
+"ether_ntoa","#include <netinet/ether.h>","","FAR char","FAR const struct ether_addr *"
+"fclose","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *"
+"fdopen","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR FILE","int","FAR const char *"
+"fflush","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *"
+"fgetc","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *"
+"fgetpos","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","FAR fpos_t *"
+"fgets","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR char","FAR char *","int","FAR FILE *"
+"fileno","#include <stdio.h>","","int","FAR FILE *"
+"fopen","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR FILE","FAR const char *","FAR const char *"
+"fprintf","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","FAR const char *","..."
+"fputc","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","int c","FAR FILE *"
+"fputs","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *","FAR FILE *"
+"fread","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","size_t","FAR void *","size_t","size_t","FAR FILE *"
+"fseek","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","long int","int"
+"fsetpos","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","FAR fpos_t *"
+"ftell","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","long","FAR FILE *"
+"fwrite","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","size_t","FAR const void *","size_t","size_t","FAR FILE *"
+"getcwd","#include <unistd.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)","FAR char","FAR char *","size_t"
+"getopt","#include <unistd.h>","","int","int","FAR char *const[]","FAR const char *"
+"getoptargp","#include <unistd.h>","","FAR char *"
+"getoptindp","#include <unistd.h>","","int"
+"getoptoptp","#include <unistd.h>","","int"
+"gets","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR char","FAR char *"
+"gmtime","#include <time.h>","","struct tm","const time_t *"
+"gmtime_r","#include <time.h>","","FAR struct tm","FAR const time_t *","FAR struct tm *"
+"htonl","#include <arpa/inet.h>","","uint32_t","uint32_t"
+"htons","#include <arpa/inet.h>","","uint16_t","uint16_t"
+"imaxabs","#include <stdlib.h>","","intmax_t","intmax_t"
+"inet_addr","#include <arpa/inet.h>","","in_addr_t","FAR const char "
+"inet_ntoa","#include <arpa/inet.h>","#if !defined(CONFIG_NET_IPv6) && defined(CONFIG_CAN_PASS_STRUCTS)","FAR char","struct in_addr"
+"inet_ntop","#include <arpa/inet.h>","","FAR const char","int","FAR const void *","FAR char *","socklen_t"
+"inet_pton","#include <arpa/inet.h>","","int","int","FAR const char *","FAR void *"
+"labs","#include <stdlib.h>","","long int","long int"
+"lib_dumpbuffer","#include <debug.h>","","void","FAR const char *","FAR const uint8_t *","unsigned int"
+"lib_lowprintf","#include <debug.h>","","int","FAR const char *","..."
+"lib_rawprintf","#include <debug.h>","","int","FAR const char *","..."
+"llabs","#include <stdlib.h>","#ifdef CONFIG_HAVE_LONG_LONG","long long int","long long int"
+"lldbg","#include <debug.h>","#if !defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llvdbg","#include <debug.h>","#if !defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"match","","","int","const char *","const char *"
+"memccpy","#include <string.h>","","FAR void","FAR void *","FAR const void *","int c","size_t"
+"memchr","#include <string.h>","","FAR void","FAR const void *","int c","size_t"
+"memcmp","#include <string.h>","","int","FAR const void *","FAR const void *","size_t"
+"memcpy","#include <string.h>","","FAR void","FAR void *","FAR const void *","size_t"
+"memmove","#include <string.h>","","FAR void","FAR void *","FAR const void *","size_t"
+"memset","#include <string.h>","","FAR void","FAR void *","int c","size_t"
+"mktime","#include <time.h>","","time_t","const struct tm *"
+"mq_getattr","#include <mqueue.h>","#ifndef CONFIG_DISABLE_MQUEUE","int","mqd_t","struct mq_attr *"
+"mq_setattr","#include <mqueue.h>","#ifndef CONFIG_DISABLE_MQUEUE","int","mqd_t","const struct mq_attr *","struct mq_attr *"
+"ntohl","#include <arpa/inet.h>","","uint32_t","uint32_t"
+"ntohs","#include <arpa/inet.h>","","uint16_t","uint16_t"
+"perror","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","void","FAR const char *"
+"printf","#include <stdio.h>","","int","const char *","..."
+"pthread_attr_destroy","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *"
+"pthread_attr_getinheritsched","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR const pthread_attr_t *","FAR int *"
+"pthread_attr_getschedparam","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *","FAR struct sched_param *"
+"pthread_attr_getschedpolicy","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *","int *"
+"pthread_attr_getstacksize","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *","FAR long *"
+"pthread_attr_init","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *"
+"pthread_attr_setinheritsched","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *","int"
+"pthread_attr_setschedparam","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *","FAR const struct sched_param *"
+"pthread_attr_setschedpolicy","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *","int"
+"pthread_attr_setstacksize","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_attr_t *","long"
+"pthread_barrierattr_destroy","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_barrierattr_t *"
+"pthread_barrierattr_getpshared","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR const pthread_barrierattr_t *","FAR int *"
+"pthread_barrierattr_init","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_barrierattr_t *"
+"pthread_barrierattr_setpshared","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_barrierattr_t *","int"
+"pthread_condattr_destroy","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_condattr_t *"
+"pthread_condattr_init","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_condattr_t *"
+"pthread_mutexattr_destroy","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_mutexattr_t *"
+"pthread_mutexattr_getpshared","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_mutexattr_t *","FAR int *"
+"pthread_mutexattr_gettype","#include <pthread.h>","#if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_MUTEX_TYPES)","int","const pthread_mutexattr_t *","int *"
+"pthread_mutexattr_init","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_mutexattr_t *"
+"pthread_mutexattr_setpshared","#include <pthread.h>","#ifndef CONFIG_DISABLE_PTHREAD","int","FAR pthread_mutexattr_t *","int "
+"pthread_mutexattr_settype","#include <pthread.h>","#if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_MUTEX_TYPES)","int","pthread_mutexattr_t *","int"
+"puts","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *"
+"qsort","#include <stdlib.h>","","void","void *","size_t","size_t","int(*)(const void *","const void *)"
+"rand","#include <stdlib.h>","","int"
+"readdir_r","#include <dirent.h>","#if CONFIG_NFILE_DESCRIPTORS > 0","int","FAR DIR *","FAR struct dirent *","FAR struct dirent **"
+"rint","","","double_t","double_t"
+"sched_get_priority_max","#include <sched.h>","","int","int"
+"sched_get_priority_min","#include <sched.h>","","int","int"
+"sem_getvalue","#include <semaphore.h>","","int","FAR sem_t *","FAR int *"
+"sem_init","#include <semaphore.h>","","int","FAR sem_t *","int","unsigned int"
+"sigaddset","#include <signal.h>","#ifndef CONFIG_DISABLE_SIGNALS","int","FAR sigset_t *","int"
+"sigdelset","#include <signal.h>","#ifndef CONFIG_DISABLE_SIGNALS","int","FAR sigset_t *","int"
+"sigemptyset","#include <signal.h>","#ifndef CONFIG_DISABLE_SIGNALS","int","FAR sigset_t *"
+"sigfillset","#include <signal.h>","#ifndef CONFIG_DISABLE_SIGNALS","int","FAR sigset_t *"
+"sigismember","#include <signal.h>","#ifndef CONFIG_DISABLE_SIGNALS","int","FAR const sigset_t *","int"
+"snprintf","#include <stdio.h>","","int","FAR char *","size_t","const char *","..."
+"sprintf","#include <stdio.h>","","int","FAR char *","const char *","..."
+"sq_addafter","#include <queue.h>","","void","FAR sq_entry_t *","FAR sq_entry_t *","FAR sq_queue_t *"
+"sq_addfirst","#include <queue.h>","","void","FAR sq_entry_t *","sq_queue_t *"
+"sq_addlast","#include <queue.h>","","void","FAR sq_entry_t *","sq_queue_t *"
+"sq_rem","#include <queue.h>","","void","FAR sq_entry_t *","sq_queue_t *"
+"sq_remafter","#include <queue.h>","","FAR sq_entry_t","FAR sq_entry_t *","sq_queue_t *"
+"sq_remfirst","#include <queue.h>","","FAR sq_entry_t","sq_queue_t *"
+"sq_remlast","#include <queue.h>","","FAR sq_entry_t","sq_queue_t *"
+"srand","#include <stdlib.h>","","void","unsigned int"
+"sscanf","#include <stdio.h>","","int","const char *","const char *","..."
+"strcasecmp","#include <string.h>","","int","FAR const char *","FAR const char *"
+"strcasestr","#include <string.h>","","FAR char","FAR const char *","FAR const char *"
+"strcat","#include <string.h>","","FAR char","FAR char *","FAR const char *"
+"strchr","#include <string.h>","","FAR char","FAR const char *","int"
+"strcmp","#include <string.h>","","int","FAR const char *","FAR const char *"
+"strcpy","#include <string.h>","","FAR char","char *","FAR const char *"
+"strcspn","#include <string.h>","","size_t","FAR const char *","FAR const char *"
+"strdup","#include <string.h>","","FAR char","FAR const char *"
+"strerror","#include <string.h>","","FAR const char","int"
+"strftime","#include <time.h>","","size_t","char *","size_t","const char *","const struct tm *"
+"strlen","#include <string.h>","","size_t","FAR const char *"
+"strncasecmp","#include <string.h>","","int","FAR const char *","FAR const char *","size_t"
+"strncat","#include <string.h>","","FAR char","FAR char *","FAR const char *","size_t"
+"strncmp","#include <string.h>","","int","FAR const char *","FAR const char *","size_t"
+"strncpy","#include <string.h>","","FAR char","char *","FAR const char *","size_t"
+"strndup","#include <string.h>","","FAR char","FAR const char *","size_t"
+"strnlen","#include <string.h>","","size_t","FAR const char *","size_t"
+"strpbrk","#include <string.h>","","FAR char","FAR const char *","FAR const char *"
+"strrchr","#include <string.h>","","FAR char","FAR const char *","int"
+"strspn","#include <string.h>","","size_t","FAR const char *","FAR const char *"
+"strstr","#include <string.h>","","FAR char","FAR const char *","FAR const char *"
+"strtod","#include <stdlib.h>","","double_t","const char *str","char **endptr"
+"strtok","#include <string.h>","","FAR char","FAR char *","FAR const char *"
+"strtok_r","#include <string.h>","","FAR char","FAR char *","FAR const char *","FAR char **"
+"strtol","#include <string.h>","","long","const char *","char **","int"
+"strtoll","#include <stdlib.h>","#ifdef CONFIG_HAVE_LONG_LONG","long long","const char *nptr","char **endptr","int base"
+"strtoul","#include <stdlib.h>","","unsigned long","const char *","char **","int"
+"strtoull","#include <stdlib.h>","#ifdef CONFIG_HAVE_LONG_LONG","unsigned long long","const char *","char **","int"
+"tcflush","#include <termios.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","int"
+"tcgetattr","#include <termios.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","FAR struct termios *"
+"tcsetattr","#include <termios.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_SERIAL_TERMIOS)","int","int","int","FAR const struct termios *"
+"telldir","#include <dirent.h>","#if CONFIG_NFILE_DESCRIPTORS > 0","off_t","FAR DIR *"
+"time","#include <time.h>","","time_t","time_t *"
+"ub16divub16","#include <fixedmath.h>","","ub16_t","ub16_t","ub16_t"
+"ub16mulub16","#include <fixedmath.h>","","ub16_t","ub16_t","ub16_t"
+"ub16sqr","#include <fixedmath.h>","","ub16_t","ub16_t"
+"ungetc","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","int","FAR FILE *"
+"vdbg","#include <debug.h>","#if !defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_VERBOSE)","int","const char *","..."
+"vfprintf","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","const char *","va_list"
+"vprintf","#include <stdio.h>","#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *","va_list"
+"vsnprintf","#include <stdio.h>","","int","FAR char *","size_t","const char *","va_list"
+"vsprintf","#include <stdio.h>","","int","FAR char *","const char *","va_list"
+"vsscanf","#include <stdio.h>","","int","char *","const char *","va_list"
diff --git a/nuttx/lib/libgen/lib_basename.c b/nuttx/lib/libgen/lib_basename.c
index 5741d976a9..986c6b8520 100644
--- a/nuttx/lib/libgen/lib_basename.c
+++ b/nuttx/lib/libgen/lib_basename.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * lib/libgen/lib_basename.c
  *
- *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -78,7 +78,7 @@ static char g_retchar[2];
  *
  ****************************************************************************/
 
-char *basename(char *path)
+FAR char *basename(FAR char *path)
 {
   char *p;
   int   len;
diff --git a/nuttx/lib/libgen/lib_dirname.c b/nuttx/lib/libgen/lib_dirname.c
index c416d8aca3..248293a605 100644
--- a/nuttx/lib/libgen/lib_dirname.c
+++ b/nuttx/lib/libgen/lib_dirname.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * lib/libgen/lib_dirname.c
  *
- *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -78,7 +78,7 @@ static char g_retchar[2];
  *
  ****************************************************************************/
 
-char *dirname(char *path)
+FAR char *dirname(FAR char *path)
 {
   char *p;
   int   len;
diff --git a/nuttx/lib/math/lib_b16atan2.c b/nuttx/lib/math/lib_b16atan2.c
index a396524517..8792fa0879 100644
--- a/nuttx/lib/math/lib_b16atan2.c
+++ b/nuttx/lib/math/lib_b16atan2.c
@@ -2,7 +2,7 @@
  * lib/math/lib_b16atan2.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/math/lib_b16cos.c b/nuttx/lib/math/lib_b16cos.c
index 69cc610425..7547871f63 100644
--- a/nuttx/lib/math/lib_b16cos.c
+++ b/nuttx/lib/math/lib_b16cos.c
@@ -2,7 +2,7 @@
  * lib/math/lib_b16cos.c
  *
  *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/math/lib_b16sin.c b/nuttx/lib/math/lib_b16sin.c
index fc4b5e5663..1eee179934 100644
--- a/nuttx/lib/math/lib_b16sin.c
+++ b/nuttx/lib/math/lib_b16sin.c
@@ -2,7 +2,7 @@
  * lib/math/lib_b16sin.c
  *
  *   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/math/lib_fixedmath.c b/nuttx/lib/math/lib_fixedmath.c
index b20158dc85..c1a710e739 100644
--- a/nuttx/lib/math/lib_fixedmath.c
+++ b/nuttx/lib/math/lib_fixedmath.c
@@ -2,7 +2,7 @@
  * lib/math/lib_fixedmath.c
  *
  *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -165,7 +165,7 @@ ub16_t ub16mulub16(ub16_t m1, ub16_t m2)
 }
 
 /****************************************************************************
- * Name: b16divb16
+ * Name: b16sqr
  **************************************************************************/
 
 b16_t b16sqr(b16_t a)
diff --git a/nuttx/lib/math/lib_rint.c b/nuttx/lib/math/lib_rint.c
index b122870b81..bd861ecedc 100644
--- a/nuttx/lib/math/lib_rint.c
+++ b/nuttx/lib/math/lib_rint.c
@@ -2,7 +2,7 @@
  * lib/math/lib_rint.c
  *
  *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/net/lib_etherntoa.c b/nuttx/lib/net/lib_etherntoa.c
index 2535491833..f89f205a2e 100644
--- a/nuttx/lib/net/lib_etherntoa.c
+++ b/nuttx/lib/net/lib_etherntoa.c
@@ -2,7 +2,7 @@
  * lib/net/lib_etherntoa.c
  *
  *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -58,7 +58,7 @@
  *
  ****************************************************************************/
 
-char *ether_ntoa(const struct ether_addr *addr)
+FAR char *ether_ntoa(FAR const struct ether_addr *addr)
 {
   static char buffer[20];
   sprintf(buffer, "%02x:%02x:%02x:%02x:%02x:%02x",
diff --git a/nuttx/lib/net/lib_htonl.c b/nuttx/lib/net/lib_htonl.c
index f43b525050..e4c3e53838 100644
--- a/nuttx/lib/net/lib_htonl.c
+++ b/nuttx/lib/net/lib_htonl.c
@@ -2,7 +2,7 @@
  * lib/net/lib_ntohl.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/net/lib_htons.c b/nuttx/lib/net/lib_htons.c
index 66d736a33f..b4117e1dc2 100644
--- a/nuttx/lib/net/lib_htons.c
+++ b/nuttx/lib/net/lib_htons.c
@@ -2,7 +2,7 @@
  * lib/net/lib_htons.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrdestroy.c b/nuttx/lib/pthread/pthread_attrdestroy.c
index fdadab7432..103528c7e1 100644
--- a/nuttx/lib/pthread/pthread_attrdestroy.c
+++ b/nuttx/lib/pthread/pthread_attrdestroy.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrdestroy.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrgetinheritsched.c b/nuttx/lib/pthread/pthread_attrgetinheritsched.c
index c1b764faa3..02d6e0b7c0 100644
--- a/nuttx/lib/pthread/pthread_attrgetinheritsched.c
+++ b/nuttx/lib/pthread/pthread_attrgetinheritsched.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrgetinheritsched.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrgetschedparam.c b/nuttx/lib/pthread/pthread_attrgetschedparam.c
index fa456f61a4..c6bf55dea8 100644
--- a/nuttx/lib/pthread/pthread_attrgetschedparam.c
+++ b/nuttx/lib/pthread/pthread_attrgetschedparam.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrgetschedparam.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrgetschedpolicy.c b/nuttx/lib/pthread/pthread_attrgetschedpolicy.c
index b4f762b519..c42b828c96 100644
--- a/nuttx/lib/pthread/pthread_attrgetschedpolicy.c
+++ b/nuttx/lib/pthread/pthread_attrgetschedpolicy.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrgetschedpolicy.c
  *
  *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrgetstacksize.c b/nuttx/lib/pthread/pthread_attrgetstacksize.c
index 06e40b5fbe..2faa586ba8 100644
--- a/nuttx/lib/pthread/pthread_attrgetstacksize.c
+++ b/nuttx/lib/pthread/pthread_attrgetstacksize.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrgetstacksize.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrinit.c b/nuttx/lib/pthread/pthread_attrinit.c
index 7df73e54b4..d06a535d78 100644
--- a/nuttx/lib/pthread/pthread_attrinit.c
+++ b/nuttx/lib/pthread/pthread_attrinit.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrinit.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrsetinheritsched.c b/nuttx/lib/pthread/pthread_attrsetinheritsched.c
index ebdc9b3e45..df2c2fba33 100644
--- a/nuttx/lib/pthread/pthread_attrsetinheritsched.c
+++ b/nuttx/lib/pthread/pthread_attrsetinheritsched.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrsetinheritsched.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrsetschedparam.c b/nuttx/lib/pthread/pthread_attrsetschedparam.c
index 4f65bcd8cb..c2ab4d1c41 100644
--- a/nuttx/lib/pthread/pthread_attrsetschedparam.c
+++ b/nuttx/lib/pthread/pthread_attrsetschedparam.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrsetschedparam.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrsetschedpolicy.c b/nuttx/lib/pthread/pthread_attrsetschedpolicy.c
index b4b1fd0543..4e43e635de 100644
--- a/nuttx/lib/pthread/pthread_attrsetschedpolicy.c
+++ b/nuttx/lib/pthread/pthread_attrsetschedpolicy.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrsetschedpolicy.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_attrsetstacksize.c b/nuttx/lib/pthread/pthread_attrsetstacksize.c
index a2de8ac78d..8a826dd3ac 100644
--- a/nuttx/lib/pthread/pthread_attrsetstacksize.c
+++ b/nuttx/lib/pthread/pthread_attrsetstacksize.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_attrsetstacksize.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_barrierattrdestroy.c b/nuttx/lib/pthread/pthread_barrierattrdestroy.c
index 7498bc4f23..6d16b9cff8 100644
--- a/nuttx/lib/pthread/pthread_barrierattrdestroy.c
+++ b/nuttx/lib/pthread/pthread_barrierattrdestroy.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_barrierattrdestroy.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_barrierattrgetpshared.c b/nuttx/lib/pthread/pthread_barrierattrgetpshared.c
index f4b4f64c13..d29bc6dfc8 100644
--- a/nuttx/lib/pthread/pthread_barrierattrgetpshared.c
+++ b/nuttx/lib/pthread/pthread_barrierattrgetpshared.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_barrierattrgetpshared.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_barrierattrinit.c b/nuttx/lib/pthread/pthread_barrierattrinit.c
index 47bbb8eb42..b5f35ca917 100644
--- a/nuttx/lib/pthread/pthread_barrierattrinit.c
+++ b/nuttx/lib/pthread/pthread_barrierattrinit.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_barrierattrinit.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_barrierattrsetpshared.c b/nuttx/lib/pthread/pthread_barrierattrsetpshared.c
index a982eea393..d0eecbf5a4 100644
--- a/nuttx/lib/pthread/pthread_barrierattrsetpshared.c
+++ b/nuttx/lib/pthread/pthread_barrierattrsetpshared.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_barrierattrsetpshared.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_condattrdestroy.c b/nuttx/lib/pthread/pthread_condattrdestroy.c
index c55dcd4e3f..d6c3df5d1a 100644
--- a/nuttx/lib/pthread/pthread_condattrdestroy.c
+++ b/nuttx/lib/pthread/pthread_condattrdestroy.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_condattrdestroy.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_condattrinit.c b/nuttx/lib/pthread/pthread_condattrinit.c
index 75f01a11b6..5721c61593 100644
--- a/nuttx/lib/pthread/pthread_condattrinit.c
+++ b/nuttx/lib/pthread/pthread_condattrinit.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_condattrinit.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_mutexattrdestroy.c b/nuttx/lib/pthread/pthread_mutexattrdestroy.c
index 59e81528be..e9868df68b 100644
--- a/nuttx/lib/pthread/pthread_mutexattrdestroy.c
+++ b/nuttx/lib/pthread/pthread_mutexattrdestroy.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_mutexattrdestroy.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_mutexattrgetpshared.c b/nuttx/lib/pthread/pthread_mutexattrgetpshared.c
index e5e09bbbe1..bc6379db5f 100644
--- a/nuttx/lib/pthread/pthread_mutexattrgetpshared.c
+++ b/nuttx/lib/pthread/pthread_mutexattrgetpshared.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_mutexattrgetpshared.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_mutexattrgettype.c b/nuttx/lib/pthread/pthread_mutexattrgettype.c
index 93cbe36019..5fb10f3015 100644
--- a/nuttx/lib/pthread/pthread_mutexattrgettype.c
+++ b/nuttx/lib/pthread/pthread_mutexattrgettype.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_mutexattrgettype.c
  *
  *   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_mutexattrinit.c b/nuttx/lib/pthread/pthread_mutexattrinit.c
index 729b0b8e14..f815bf16c1 100644
--- a/nuttx/lib/pthread/pthread_mutexattrinit.c
+++ b/nuttx/lib/pthread/pthread_mutexattrinit.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_mutexattrinit.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_mutexattrsetpshared.c b/nuttx/lib/pthread/pthread_mutexattrsetpshared.c
index 752e9faa03..900476fdd2 100644
--- a/nuttx/lib/pthread/pthread_mutexattrsetpshared.c
+++ b/nuttx/lib/pthread/pthread_mutexattrsetpshared.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_mutexattrsetpshared.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/pthread/pthread_mutexattrsettype.c b/nuttx/lib/pthread/pthread_mutexattrsettype.c
index e095dd70c3..81427c757e 100644
--- a/nuttx/lib/pthread/pthread_mutexattrsettype.c
+++ b/nuttx/lib/pthread/pthread_mutexattrsettype.c
@@ -2,7 +2,7 @@
  * lib/pthread/pthread_mutexattrsettype.c
  *
  *   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/sched/sched_getprioritymax.c b/nuttx/lib/sched/sched_getprioritymax.c
index 8be45d7100..14b368dfc0 100644
--- a/nuttx/lib/sched/sched_getprioritymax.c
+++ b/nuttx/lib/sched/sched_getprioritymax.c
@@ -2,7 +2,7 @@
  * lib/sched/sched_getprioritymax.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/sched/sched_getprioritymin.c b/nuttx/lib/sched/sched_getprioritymin.c
index a590f1fc2e..86410cb0f6 100644
--- a/nuttx/lib/sched/sched_getprioritymin.c
+++ b/nuttx/lib/sched/sched_getprioritymin.c
@@ -2,7 +2,7 @@
  * lib/sched/sched_getprioritymin.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/semaphore/sem_getvalue.c b/nuttx/lib/semaphore/sem_getvalue.c
index 137eb90010..31c6bb7e06 100644
--- a/nuttx/lib/semaphore/sem_getvalue.c
+++ b/nuttx/lib/semaphore/sem_getvalue.c
@@ -2,7 +2,7 @@
  * lib/semaphore/sem_getvalue.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/signal/sig_addset.c b/nuttx/lib/signal/sig_addset.c
index af9463aac8..19ba0cb6b6 100644
--- a/nuttx/lib/signal/sig_addset.c
+++ b/nuttx/lib/signal/sig_addset.c
@@ -2,7 +2,7 @@
  * lib/signal/sig_addset.c
  *
  *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/signal/sig_delset.c b/nuttx/lib/signal/sig_delset.c
index 489c59afac..1c661d37f6 100644
--- a/nuttx/lib/signal/sig_delset.c
+++ b/nuttx/lib/signal/sig_delset.c
@@ -2,7 +2,7 @@
  * lib/signal/sig_delset.c
  *
  *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/signal/sig_emptyset.c b/nuttx/lib/signal/sig_emptyset.c
index bfee588323..ac0c6b3e89 100644
--- a/nuttx/lib/signal/sig_emptyset.c
+++ b/nuttx/lib/signal/sig_emptyset.c
@@ -2,7 +2,7 @@
  * lib/signal/sig_emptyset.c
  *
  *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/signal/sig_fillset.c b/nuttx/lib/signal/sig_fillset.c
index c660da0ad8..8697d7577f 100644
--- a/nuttx/lib/signal/sig_fillset.c
+++ b/nuttx/lib/signal/sig_fillset.c
@@ -2,7 +2,7 @@
  * lib/signal/sig_fillset.c
  *
  *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/signal/sig_ismember.c b/nuttx/lib/signal/sig_ismember.c
index 88dc8d819b..c5bb091b7b 100644
--- a/nuttx/lib/signal/sig_ismember.c
+++ b/nuttx/lib/signal/sig_ismember.c
@@ -2,7 +2,7 @@
  * lib/signal/sig_ismember.c
  *
  *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/stdio/lib_fileno.c b/nuttx/lib/stdio/lib_fileno.c
index ff18cc33d7..fca08fc0d4 100644
--- a/nuttx/lib/stdio/lib_fileno.c
+++ b/nuttx/lib/stdio/lib_fileno.c
@@ -63,6 +63,7 @@ int fileno(FAR FILE *stream)
       set_errno(EBADF);
       return ERROR;
     }
+
   return ret;
 }
 #endif /* CONFIG_NFILE_STREAMS */
diff --git a/nuttx/lib/stdlib/lib_abs.c b/nuttx/lib/stdlib/lib_abs.c
index 5c805d8579..1a0c1671cc 100644
--- a/nuttx/lib/stdlib/lib_abs.c
+++ b/nuttx/lib/stdlib/lib_abs.c
@@ -2,7 +2,7 @@
  * lib/stdlib/lib_abs.c
  *
  *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/stdlib/lib_imaxabs.c b/nuttx/lib/stdlib/lib_imaxabs.c
index d16791b268..c6e227c7de 100644
--- a/nuttx/lib/stdlib/lib_imaxabs.c
+++ b/nuttx/lib/stdlib/lib_imaxabs.c
@@ -2,7 +2,7 @@
  * lib/stdlib//lib_abs.c
  *
  *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/stdlib/lib_labs.c b/nuttx/lib/stdlib/lib_labs.c
index c9d9c19351..f7218ee833 100644
--- a/nuttx/lib/stdlib/lib_labs.c
+++ b/nuttx/lib/stdlib/lib_labs.c
@@ -2,7 +2,7 @@
  * lib/stdlib/lib_labs.c
  *
  *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/stdlib/lib_llabs.c b/nuttx/lib/stdlib/lib_llabs.c
index 24e26e9e11..db7d3dbe07 100644
--- a/nuttx/lib/stdlib/lib_llabs.c
+++ b/nuttx/lib/stdlib/lib_llabs.c
@@ -2,7 +2,7 @@
  * lib/stdlib/lib_llabs.c
  *
  *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/stdlib/lib_qsort.c b/nuttx/lib/stdlib/lib_qsort.c
index 13bca7499a..9dd5c00409 100644
--- a/nuttx/lib/stdlib/lib_qsort.c
+++ b/nuttx/lib/stdlib/lib_qsort.c
@@ -2,7 +2,7 @@
  * lib/stdlib/lib_qsort.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Leveraged from:
  *
diff --git a/nuttx/lib/stdlib/lib_rand.c b/nuttx/lib/stdlib/lib_rand.c
index 537bc1aaee..7227c52d0d 100644
--- a/nuttx/lib/stdlib/lib_rand.c
+++ b/nuttx/lib/stdlib/lib_rand.c
@@ -2,7 +2,7 @@
  * lib/stdlib/lib_rand.c
  *
  *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/string/lib_strtokr.c b/nuttx/lib/string/lib_strtokr.c
index 366a318198..0d12a23815 100644
--- a/nuttx/lib/string/lib_strtokr.c
+++ b/nuttx/lib/string/lib_strtokr.c
@@ -90,7 +90,7 @@
  *
  ****************************************************************************/
 
-char *strtok_r(char *str, const char *delim, char **saveptr)
+FAR char *strtok_r(FAR char *str, FAR const char *delim, FAR char **saveptr)
 {
   char *pbegin;
   char *pend = NULL;
diff --git a/nuttx/lib/time/lib_calendar2utc.c b/nuttx/lib/time/lib_calendar2utc.c
index 642e23568a..e80c292fc6 100644
--- a/nuttx/lib/time/lib_calendar2utc.c
+++ b/nuttx/lib/time/lib_calendar2utc.c
@@ -2,7 +2,7 @@
  * lib/time/lib_calendar2utc.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/time/lib_daysbeforemonth.c b/nuttx/lib/time/lib_daysbeforemonth.c
index 4312adaba2..8000b0e7a9 100644
--- a/nuttx/lib/time/lib_daysbeforemonth.c
+++ b/nuttx/lib/time/lib_daysbeforemonth.c
@@ -2,7 +2,7 @@
  * lib/time/lib_daysbeforemonth.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/time/lib_gmtime.c b/nuttx/lib/time/lib_gmtime.c
index 7bce8391ed..99afeded9e 100644
--- a/nuttx/lib/time/lib_gmtime.c
+++ b/nuttx/lib/time/lib_gmtime.c
@@ -2,7 +2,7 @@
  * lib/time/lib_gmtime.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/time/lib_gmtimer.c b/nuttx/lib/time/lib_gmtimer.c
index 146939e7a4..ba1c9724f1 100644
--- a/nuttx/lib/time/lib_gmtimer.c
+++ b/nuttx/lib/time/lib_gmtimer.c
@@ -2,7 +2,7 @@
  * lib/time/lib_gmtimer.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/time/lib_isleapyear.c b/nuttx/lib/time/lib_isleapyear.c
index 24d7d6153d..966c248e01 100644
--- a/nuttx/lib/time/lib_isleapyear.c
+++ b/nuttx/lib/time/lib_isleapyear.c
@@ -2,7 +2,7 @@
  * lib/time/lib_isleapyear.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/time/lib_mktime.c b/nuttx/lib/time/lib_mktime.c
index 2e8cfc119e..8c17e7c0ab 100644
--- a/nuttx/lib/time/lib_mktime.c
+++ b/nuttx/lib/time/lib_mktime.c
@@ -2,7 +2,7 @@
  * lib/time/lib_mktime.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/time/lib_strftime.c b/nuttx/lib/time/lib_strftime.c
index c1ac345ee0..cd0804f55d 100644
--- a/nuttx/lib/time/lib_strftime.c
+++ b/nuttx/lib/time/lib_strftime.c
@@ -2,7 +2,7 @@
  * lib/time/lib_strftime.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/time/lib_time.c b/nuttx/lib/time/lib_time.c
index 02853132b0..106a04c366 100644
--- a/nuttx/lib/time/lib_time.c
+++ b/nuttx/lib/time/lib_time.c
@@ -2,7 +2,7 @@
  * lib/time/lib_time.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/unistd/lib_chdir.c b/nuttx/lib/unistd/lib_chdir.c
index f79b424ff0..3dd1333cec 100644
--- a/nuttx/lib/unistd/lib_chdir.c
+++ b/nuttx/lib/unistd/lib_chdir.c
@@ -2,7 +2,7 @@
  * lib/unistd/lib_chdir.c
  *
  *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/unistd/lib_getcwd.c b/nuttx/lib/unistd/lib_getcwd.c
index 9bfa102fb6..b94823300b 100644
--- a/nuttx/lib/unistd/lib_getcwd.c
+++ b/nuttx/lib/unistd/lib_getcwd.c
@@ -2,7 +2,7 @@
  * lib/unistd/lib_getcwd.c
  *
  *   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/unistd/lib_getopt.c b/nuttx/lib/unistd/lib_getopt.c
index 26a2c7fae4..832d287213 100644
--- a/nuttx/lib/unistd/lib_getopt.c
+++ b/nuttx/lib/unistd/lib_getopt.c
@@ -2,7 +2,7 @@
  * lib/unistd/lib_getopt.c
  *
  *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/unistd/lib_getoptargp.c b/nuttx/lib/unistd/lib_getoptargp.c
index 4a483c051b..98a4850169 100644
--- a/nuttx/lib/unistd/lib_getoptargp.c
+++ b/nuttx/lib/unistd/lib_getoptargp.c
@@ -2,7 +2,7 @@
  * lib/unistd/lib_getoptargp.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/unistd/lib_getoptindp.c b/nuttx/lib/unistd/lib_getoptindp.c
index 002201aa94..7714f8e708 100644
--- a/nuttx/lib/unistd/lib_getoptindp.c
+++ b/nuttx/lib/unistd/lib_getoptindp.c
@@ -2,7 +2,7 @@
  * lib/unistd/lib_getoptindp.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/unistd/lib_getoptoptp.c b/nuttx/lib/unistd/lib_getoptoptp.c
index 2214f2d141..4805b7ac3b 100644
--- a/nuttx/lib/unistd/lib_getoptoptp.c
+++ b/nuttx/lib/unistd/lib_getoptoptp.c
@@ -2,7 +2,7 @@
  * lib/unistd/lib_getoptoptp.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions