diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer.c | 4 | ||||
| -rw-r--r-- | src/conns.c | 6 | ||||
| -rw-r--r-- | src/dnsclient.c | 4 | ||||
| -rw-r--r-- | src/hashmap.c | 8 | ||||
| -rw-r--r-- | src/reqs.c | 10 | ||||
| -rw-r--r-- | src/stats.c | 4 | ||||
| -rw-r--r-- | src/text.c | 4 | ||||
| -rw-r--r-- | src/thread.c | 6 | ||||
| -rw-r--r-- | src/tinyproxy.c | 4 | ||||
| -rw-r--r-- | src/utils.c | 4 | ||||
| -rw-r--r-- | src/vector.c | 10 |
11 files changed, 32 insertions, 32 deletions
diff --git a/src/buffer.c b/src/buffer.c index 16bd60a..1d48e0c 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,8 +1,8 @@ -/* $Id: buffer.c,v 1.21 2002-05-23 18:22:48 rjkaes Exp $ +/* $Id: buffer.c,v 1.22 2002-05-24 04:45:32 rjkaes Exp $ * * The buffer used in each connection is a linked list of lines. As the lines * are read in and written out the buffer expands and contracts. Basically, - * by using this method we can increase the buffer size dynamicly. However, + * by using this method we can increase the buffer size dynamically. However, * we have a hard limit of 64 KB for the size of the buffer. The buffer can be * thought of as a queue were we act on both the head and tail. The various * functions act on each end (the names are taken from what Perl uses to act on diff --git a/src/conns.c b/src/conns.c index 2d3f8a7..c353599 100644 --- a/src/conns.c +++ b/src/conns.c @@ -1,7 +1,7 @@ -/* $Id: conns.c,v 1.11 2002-05-23 18:23:29 rjkaes Exp $ +/* $Id: conns.c,v 1.12 2002-05-24 04:45:32 rjkaes Exp $ * * Create and free the connection structure. One day there could be - * other connnection related tasks put here, but for now the header + * other connection related tasks put here, but for now the header * file and this file are only used for create/free functions and the * connection structure definition. * @@ -34,7 +34,7 @@ initialize_conn(int client_fd, const char* ipaddr, const char* string_addr) assert(client_fd >= 0); /* - * Allocate the memory for all the internal componets + * Allocate the memory for all the internal components */ cbuffer = new_buffer(); sbuffer = new_buffer(); diff --git a/src/dnsclient.c b/src/dnsclient.c index 7bf313d..4415b81 100644 --- a/src/dnsclient.c +++ b/src/dnsclient.c @@ -1,4 +1,4 @@ -/* $Id: dnsclient.c,v 1.1 2002-05-23 04:40:06 rjkaes Exp $ +/* $Id: dnsclient.c,v 1.2 2002-05-24 04:45:32 rjkaes Exp $ * * Create the dnsserver child process, and then include functions to * retrieve IP addresses or host names. These functions are required @@ -40,7 +40,7 @@ static char* unix_socket_loc; /* * Fork a copy of the "dnsserver" program. Two arguments are used * by this function: 'dnsserver_location' is the complete path to the - * dnsserver execuatable; 'path' is the absolute path used by the + * dnsserver executable; 'path' is the absolute path used by the * Unix socket. */ int diff --git a/src/hashmap.c b/src/hashmap.c index ba700a0..c7aa3a5 100644 --- a/src/hashmap.c +++ b/src/hashmap.c @@ -1,4 +1,4 @@ -/* $Id: hashmap.c,v 1.10 2002-05-23 18:20:27 rjkaes Exp $ +/* $Id: hashmap.c,v 1.11 2002-05-24 04:45:32 rjkaes Exp $ * * A hashmap implementation. The keys are case-insensitive NULL terminated * strings, and the data is arbitrary lumps of data. Copies of both the @@ -310,7 +310,7 @@ hashmap_find(hashmap_t map, const char* key) return -EINVAL; /* - * Loop through all the keys and look for the first occurance + * Loop through all the keys and look for the first occurrence * of a particular key. */ for (i = 0; i < map->size; i++) { @@ -372,7 +372,7 @@ hashmap_return_entry(hashmap_t map, hashmap_iter iter, } /* - * Searches for _any_ occurrances of "key" within the hashmap. + * Searches for _any_ occurrences of "key" within the hashmap. * * Returns: negative upon an error * zero if no key is found @@ -394,7 +394,7 @@ hashmap_search(hashmap_t map, const char *key) ptr = map->buckets[hash]; - /* Okay, there is an entry here, now see if it's the one we want */ + /* All right, there is an entry here, now see if it's the one we want */ while (ptr) { if (strcasecmp(ptr->key, key) == 0) ++count; @@ -1,4 +1,4 @@ -/* $Id: reqs.c,v 1.74 2002-05-23 18:24:46 rjkaes Exp $ +/* $Id: reqs.c,v 1.75 2002-05-24 04:45:32 rjkaes Exp $ * * This is where all the work in tinyproxy is actually done. Incoming * connections have a new thread created for them. The thread then @@ -276,7 +276,7 @@ establish_http_connection(struct conn_s *connptr, struct request_s *request) } /* - * These two defines are for the SSL tunnelling. + * These two defines are for the SSL tunneling. */ #define SSL_CONNECTION_RESPONSE "HTTP/1.0 200 Connection established" #define PROXY_AGENT "Proxy-agent: " PACKAGE "/" VERSION @@ -309,7 +309,7 @@ process_request(struct conn_s *connptr) size_t request_len; - /* NULL out all the fields so free's don't cause segfaults. */ + /* NULL out all the fields so frees don't cause segfaults. */ request = safecalloc(1, sizeof(struct request_s)); if (!request) return NULL; @@ -899,7 +899,7 @@ process_server_headers(struct conn_s *connptr) goto ERROR_EXIT; /* - * Okay, output all the remaining headers to the client. + * All right, output all the remaining headers to the client. */ iter = hashmap_first(hashofheaders); if (iter >= 0) { @@ -990,7 +990,7 @@ relay_connection(struct conn_s *connptr) return; } else { /* - * Okay, something was actually selected so mark it. + * All right, something was actually selected so mark it. */ last_access = time(NULL); } diff --git a/src/stats.c b/src/stats.c index c239d94..d14a92c 100644 --- a/src/stats.c +++ b/src/stats.c @@ -1,4 +1,4 @@ -/* $Id: stats.c,v 1.8 2002-05-23 18:20:27 rjkaes Exp $ +/* $Id: stats.c,v 1.9 2002-05-24 04:45:32 rjkaes Exp $ * * This module handles the statistics for tinyproxy. There are only two * public API functions. The reason for the functions, rather than just a @@ -47,7 +47,7 @@ pthread_mutex_t stats_mutex = PTHREAD_MUTEX_INITIALIZER; #define UNLOCK() pthread_mutex_unlock(&stats_mutex) /* - * Initialise the statistics information to zero. + * Initialize the statistics information to zero. */ void init_stats(void) @@ -1,4 +1,4 @@ -/* $Id: text.c,v 1.1 2002-05-23 04:42:30 rjkaes Exp $ +/* $Id: text.c,v 1.2 2002-05-24 04:45:32 rjkaes Exp $ * * The functions included here are useful for text manipulation. They * replace or augment the standard C string library. These functions @@ -71,7 +71,7 @@ strlcat(char *dst, const char *src, size_t size) /* * Removes any new-line or carriage-return characters from the end of the - * string. This function is named afrer the same function in Perl. + * string. This function is named after the same function in Perl. * "length" should be the number of characters in the buffer, not including * the trailing NULL. * diff --git a/src/thread.c b/src/thread.c index 9313380..f757d33 100644 --- a/src/thread.c +++ b/src/thread.c @@ -1,4 +1,4 @@ -/* $Id: thread.c,v 1.30 2002-05-23 18:20:27 rjkaes Exp $ +/* $Id: thread.c,v 1.31 2002-05-24 04:45:32 rjkaes Exp $ * * Handles the creation/destruction of the various threads required for * processing incoming connections. @@ -59,7 +59,7 @@ int accept_lock_ret = pthread_mutex_unlock(&mlock); \ assert(accept_lock_ret == 0); \ } while (0) -/* Used to override the default statck size. */ +/* Used to override the default stack size. */ static pthread_attr_t thread_attr; static struct thread_config_s { @@ -135,7 +135,7 @@ thread_main(void *arg) struct thread_s *ptr; #ifdef HAVE_PTHREAD_CANCEL - /* Set the cancelation type to immediate. */ + /* Set the cancellation type to immediate. */ pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); #endif diff --git a/src/tinyproxy.c b/src/tinyproxy.c index d2ea00b..375913a 100644 --- a/src/tinyproxy.c +++ b/src/tinyproxy.c @@ -1,6 +1,6 @@ -/* $Id: tinyproxy.c,v 1.30 2002-05-23 18:27:01 rjkaes Exp $ +/* $Id: tinyproxy.c,v 1.31 2002-05-24 04:45:32 rjkaes Exp $ * - * The initialise routine. Basically sets up all the initial stuff (logfile, + * The initialize routine. Basically sets up all the initial stuff (logfile, * listening socket, config options, etc.) and then sits there and loops * over the new connections until the daemon is closed. Also has additional * functions to handle the "user friendly" aspects of a program (usage, diff --git a/src/utils.c b/src/utils.c index db11221..8d5a432 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,4 +1,4 @@ -/* $Id: utils.c,v 1.30 2002-05-23 18:28:12 rjkaes Exp $ +/* $Id: utils.c,v 1.31 2002-05-24 04:45:32 rjkaes Exp $ * * Misc. routines which are used by the various functions to handle strings * and memory allocation and pretty much anything else we can think of. Also, @@ -216,7 +216,7 @@ create_file_safely(const char *filename) } /* - * On systems whcih don't support ftruncate() the best we can + * On systems which don't support ftruncate() the best we can * do is to close the file and reopen it in create mode, which * unfortunately leads to a race condition, however "systems * which don't support ftruncate()" is pretty much SCO only, diff --git a/src/vector.c b/src/vector.c index 0a657f5..2f913de 100644 --- a/src/vector.c +++ b/src/vector.c @@ -1,6 +1,6 @@ -/* $Id: vector.c,v 1.5 2002-05-23 18:20:27 rjkaes Exp $ +/* $Id: vector.c,v 1.6 2002-05-24 04:45:32 rjkaes Exp $ * - * A vector implementation. The vector can be of an arbritrary length, and + * A vector implementation. The vector can be of an arbitrary length, and * the data for each entry is an lump of data (the size is stored in the * vector.) * @@ -31,7 +31,7 @@ * stored in struct vectorentry_s (the data and the length), and the * "vector" structure is implemented as a linked-list. The struct * vector_s stores a pointer to the first vector (vector[0]) and a - * count of the number of enteries (or how long the vector is.) + * count of the number of entries (or how long the vector is.) */ struct vectorentry_s { void *data; @@ -69,7 +69,7 @@ vector_create(void) } /* - * Deletes an vector. All the enteries when this function is run. + * Deletes an vector. All the entries when this function is run. * * Returns: 0 on success * negative if a NULL vector is supplied @@ -173,7 +173,7 @@ vector_getentry(vector_t vector, size_t pos, void **data) } /* - * Returns the number of enteries (or the length) of the vector. + * Returns the number of entries (or the length) of the vector. * * Returns: negative if vector is not valid * positive length of vector otherwise |