*.h: cosmetic and spelling fixes

Signed-off-by: Martin Dummer <[email protected]>

Author: Martin Dummer

argz.h

@@ -67,51 +67,51 @@ typedef int error_t;
 #endif
 
 /* Make a '\0' separated arg vector from a unix argv vector, returning it in
-   ARGZ, and the total length in LEN.  If a memory allocation error occurs,
-   ENOMEM is returned, otherwise 0.  The result can be destroyed using free. */
+   ARGZ, and the total length in LEN. If a memory allocation error occurs,
+   ENOMEM is returned, otherwise 0. The result can be destroyed using free. */
 extern error_t __argz_create (char *__const __argv[], char **__restrict __argz,
 			      size_t *__restrict __len);
 extern error_t argz_create (char *__const __argv[], char **__restrict __argz,
 			    size_t *__restrict __len);
 
 /* Make a '\0' separated arg vector from a SEP separated list in
-   STRING, returning it in ARGZ, and the total length in LEN.  If a
+   STRING, returning it in ARGZ, and the total length in LEN. If a
    memory allocation error occurs, ENOMEM is returned, otherwise 0.
-   The result can be destroyed using free.  */
+   The result can be destroyed using free. */
 extern error_t __argz_create_sep (__const char *__restrict __string,
 				  int __sep, char **__restrict __argz,
 				  size_t *__restrict __len);
 extern error_t argz_create_sep (__const char *__restrict __string,
 				int __sep, char **__restrict __argz,
 				size_t *__restrict __len);
 
-/* Returns the number of strings in ARGZ.  */
+/* Returns the number of strings in ARGZ. */
 extern size_t __argz_count (__const char *__argz, size_t __len)
      __attribute_pure__;
 extern size_t argz_count (__const char *__argz, size_t __len)
      __attribute_pure__;
 
 /* Puts pointers to each string in ARGZ into ARGV, which must be large enough
-   to hold them all.  */
+   to hold them all. */
 extern void __argz_extract (__const char *__restrict __argz, size_t __len,
 			    char **__restrict __argv);
 extern void argz_extract (__const char *__restrict __argz, size_t __len,
 			  char **__restrict __argv);
 
 /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
+   except the last into the character SEP. */
 extern void __argz_stringify (char *__argz, size_t __len, int __sep);
 extern void argz_stringify (char *__argz, size_t __len, int __sep);
 
-/* Append BUF, of length BUF_LEN to the argz vector in ARGZ & ARGZ_LEN.  */
+/* Append BUF, of length BUF_LEN to the argz vector in ARGZ & ARGZ_LEN. */
 extern error_t __argz_append (char **__restrict __argz,
 			      size_t *__restrict __argz_len,
 			      __const char *__restrict __buf, size_t _buf_len);
 extern error_t argz_append (char **__restrict __argz,
 			    size_t *__restrict __argz_len,
 			    __const char *__restrict __buf, size_t __buf_len);
 
-/* Append STR to the argz vector in ARGZ & ARGZ_LEN.  */
+/* Append STR to the argz vector in ARGZ & ARGZ_LEN. */
 extern error_t __argz_add (char **__restrict __argz,
 			   size_t *__restrict __argz_len,
 			   __const char *__restrict __str);
@@ -120,15 +120,15 @@ extern error_t argz_add (char **__restrict __argz,
 			 __const char *__restrict __str);
 
 /* Append SEP separated list in STRING to the argz vector in ARGZ &
-   ARGZ_LEN.  */
+   ARGZ_LEN. */
 extern error_t __argz_add_sep (char **__restrict __argz,
 			       size_t *__restrict __argz_len,
 			       __const char *__restrict __string, int __delim);
 extern error_t argz_add_sep (char **__restrict __argz,
 			     size_t *__restrict __argz_len,
 			     __const char *__restrict __string, int __delim);
 
-/* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there.  */
+/* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there. */
 extern void __argz_delete (char **__restrict __argz,
 			   size_t *__restrict __argz_len,
 			   char *__restrict __entry);
@@ -139,9 +139,9 @@ extern void argz_delete (char **__restrict __argz,
 /* Insert ENTRY into ARGZ & ARGZ_LEN before BEFORE, which should be an
    existing entry in ARGZ; if BEFORE is NULL, ENTRY is appended to the end.
    Since ARGZ's first entry is the same as ARGZ, argz_insert (ARGZ, ARGZ_LEN,
-   ARGZ, ENTRY) will insert ENTRY at the beginning of ARGZ.  If BEFORE is not
+   ARGZ, ENTRY) will insert ENTRY at the beginning of ARGZ. If BEFORE is not
    in ARGZ, EINVAL is returned, else if memory can't be allocated for the new
-   ARGZ, ENOMEM is returned, else 0.  */
+   ARGZ, ENOMEM is returned, else 0. */
 extern error_t __argz_insert (char **__restrict __argz,
 			      size_t *__restrict __argz_len,
 			      char *__restrict __before,
@@ -152,8 +152,8 @@ extern error_t argz_insert (char **__restrict __argz,
 			    __const char *__restrict __entry);
 
 /* Replace any occurrences of the string STR in ARGZ with WITH, reallocating
-   ARGZ as necessary.  If REPLACE_COUNT is non-zero, *REPLACE_COUNT will be
-   incremented by number of replacements performed.  */
+   ARGZ as necessary. If REPLACE_COUNT is non-zero, *REPLACE_COUNT will be
+   incremented by number of replacements performed. */
 extern error_t __argz_replace (char **__restrict __argz,
 			       size_t *__restrict __argz_len,
 			       __const char *__restrict __str,
@@ -166,7 +166,7 @@ extern error_t argz_replace (char **__restrict __argz,
 			     unsigned int *__restrict __replace_count);
 
 /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there
-   are no more.  If entry is NULL, then the first entry is returned.  This
+   are no more. If entry is NULL, then the first entry is returned. This
    behavior allows two convenient iteration styles:
 
     char *entry = 0;

stats.h

@@ -27,7 +27,7 @@ struct server_stats {
      struct timeval start_time;
      struct timeval end_time;
      struct tms tms;
-     
+
      /* connection statistics, updated by main thread */
      int max_simul_threads;     /* maximum number of simultaneous server */
      struct timeval min_time;   /* time between connection stats */

tftp_io.h

@@ -26,7 +26,7 @@
 /* new opcode */
 #define OACK   06
 /* new error code */
-#define EOPTNEG 8               /* error in option negociation */
+#define EOPTNEG 8               /* error in option negotiation */
 
 /* return value of tftp_get_packet */
 #define GET_DISCARD 0
@@ -38,7 +38,7 @@
 #define GET_ERROR   6
 #define GET_DATA    7
 
-/* functions prototype */
+/* function prototypes */
 int tftp_send_request(int socket, struct sockaddr_storage *s_inn, short type,
                       char *data_buffer, int data_buffer_size,
                       struct tftp_opt *tftp_options);

tftpd.h

@@ -48,22 +48,22 @@ struct thread_data {
      struct sockaddr_storage sa_mcast;
      union ip_mreq_storage mcastaddr;
      u_char mcast_ttl;
-     
+
      /*
       * Self can read/write until client_ready is set. Then only allowed to read.
       * Other thread can read it only when client_ready is set. Remember that access
-      * to client_ready bellow is protected by a mutex.
+      * to client_ready below is protected by a mutex.
       */
      struct tftp_opt *tftp_options;
- 
-     /* 
-      * Must lock to insert in the list or search, but not to read or write 
+
+     /*
+      * Must lock to insert in the list or search, but not to read or write
       * in the client_info structure, since only the propriotary thread do it.
       */
      pthread_mutex_t client_mutex;
      struct client_info *client_info;
      int client_ready;        /* one if other thread may add client */
- 
+
      /* must be lock (list lock) to update */
      struct thread_data *prev;
      struct thread_data *next;

tftpd_mtftp.h

@@ -24,8 +24,8 @@
 #include "options.h"
 
 /*
- * This structure hold information on mtftp configuration
- * 
+ * This structure holds information on mtftp configuration
+ *
  */
 struct mtftp_data {
      struct mtftp_thread *thread_data;
@@ -71,7 +71,7 @@ struct mtftp_thread {
      /* For options access */
      struct mtftp_data *mtftp_data;
 
-     struct mtftp_thread *next;     
+     struct mtftp_thread *next;
 };
 
 /*