aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/argparse.c2
-rw-r--r--util/fileutil.c4
-rw-r--r--util/iobuf.c20
-rw-r--r--util/memory.c12
-rw-r--r--util/strgutil.c2
5 files changed, 20 insertions, 20 deletions
diff --git a/util/argparse.c b/util/argparse.c
index 38e809806..9c1cd4214 100644
--- a/util/argparse.c
+++ b/util/argparse.c
@@ -659,7 +659,7 @@ usage( int level )
* 18: Optional thanks list (with LFs)
* 19: Bug report info
*20..29: Additional lib version strings.
- *30..39: Additional program infos (with LFs)
+ *30..39: Additional program info (with LFs)
* 40: short usage note (with LF)
* 41: long usage note (with LF)
*/
diff --git a/util/fileutil.c b/util/fileutil.c
index f3e00f8d6..88c84ecff 100644
--- a/util/fileutil.c
+++ b/util/fileutil.c
@@ -31,7 +31,7 @@
/****************
- * Construct a filename form the NULL terminated list of parts.
+ * Construct a filename from the NULL terminated list of parts.
* Tilde expansion is done here.
*/
char *
@@ -66,7 +66,7 @@ make_filename( const char *first_part, ... )
/****************
- * A simple function to decide, wether the filename ist stdout
+ * A simple function to decide whether the filename is stdout
* or a real filename.
*/
const char *
diff --git a/util/iobuf.c b/util/iobuf.c
index 30d6186fd..3940f1034 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -50,7 +50,7 @@ static int underflow(IOBUF a);
* Read data from a file into buf which has an allocated length of *LEN.
* return the number of read bytes in *LEN. OPAQUE is the FILE * of
* the stream. A is not used.
- * control maybe:
+ * control may be:
* IOBUFCTRL_INIT: called just before the function is linked into the
* list of function. This can be used to prepare internal
* data structures of the function.
@@ -392,7 +392,7 @@ iobuf_open( const char *fname )
}
/****************
- * create a iobuf for writing to a file; the file will be created.
+ * create an iobuf for writing to a file; the file will be created.
*/
IOBUF
iobuf_create( const char *fname )
@@ -423,8 +423,8 @@ iobuf_create( const char *fname )
}
/****************
- * append to a iobuf if the file does not exits; create it.
- * cannont be used for stdout.
+ * append to an iobuf; if the file does not exist, create it.
+ * cannot be used for stdout.
*/
IOBUF
iobuf_append( const char *fname )
@@ -579,7 +579,7 @@ iobuf_pop_filter( IOBUF a, int (*f)(void *opaque, int control,
return rc;
}
- /* and look how to remove it */
+ /* and see how to remove it */
if( a == b && !b->chain )
log_bug("can't remove the last filter from the chain\n");
else if( a == b ) { /* remove the first iobuf from the chain */
@@ -743,7 +743,7 @@ iobuf_read(IOBUF a, byte *buf, unsigned buflen )
/****************
* Have a look at the iobuf.
- * NOTE: This does only work in special cases.
+ * NOTE: This only works in special cases.
*/
int
iobuf_peek(IOBUF a, byte *buf, unsigned buflen )
@@ -845,7 +845,7 @@ iobuf_unget_and_close_temp( IOBUF a, IOBUF temp )
/****************
- * Set a limit, how much bytes may be read from the input stream A.
+ * Set a limit on how many bytes may be read from the input stream A.
* Setting the limit to 0 disables this feature.
*/
void
@@ -893,7 +893,7 @@ iobuf_tell( IOBUF a )
/****************
* This is a very limited implementation. It simply discards all internal
- * buffering and remove all filters but the first one.
+ * buffering and removes all filters but the first one.
*/
int
iobuf_seek( IOBUF a, ulong newpos )
@@ -968,7 +968,7 @@ iobuf_set_block_mode( IOBUF a, size_t n )
}
/****************
- * enable patial block mode as descriped in the OpenPGP draft.
+ * enable partial block mode as described in the OpenPGP draft.
* LEN is the first length
*/
void
@@ -990,7 +990,7 @@ iobuf_set_partial_block_mode( IOBUF a, size_t len )
/****************
- * Checks wether the stream is in block mode
+ * Checks whether the stream is in block mode
* Note: This does not work if other filters are pushed on the stream.
*/
int
diff --git a/util/memory.c b/util/memory.c
index 6ed35966f..e3f45be5b 100644
--- a/util/memory.c
+++ b/util/memory.c
@@ -4,7 +4,7 @@
* We use our own memory allocation functions instead of plain malloc(),
* so that we can provide some special enhancements:
* a) functions to provide memory from a secure memory.
- * b) By looking at the requested allocation size we
+ * b) by looking at the requested allocation size we
* can reuse memory very quickly (e.g. MPI storage)
* (really needed?)
* c) memory usage reporting if compiled with M_DEBUG
@@ -103,7 +103,7 @@ struct memtbl_entry {
#define info_hash(p) ( *(u32*)((p)) % INFO_BUCKETS )
static struct info_entry *info_strings[INFO_BUCKETS]; /* hash table */
-static struct memtbl_entry *memtbl; /* the table with the memory infos */
+static struct memtbl_entry *memtbl; /* the table with the memory info */
static unsigned memtbl_size; /* number of allocated entries */
static unsigned memtbl_len; /* number of used entries */
static struct memtbl_entry *memtbl_unused;/* to keep track of unused entries */
@@ -127,7 +127,7 @@ add_entry( byte *p, unsigned n, int mode, const char *info, const char *by )
index = memtbl_len++;
else {
struct memtbl_entry *e;
- /* look for an used entry in the table. We take the first one,
+ /* look for a used entry in the table. We take the first one,
* so that freed entries remain as long as possible in the table
* (free appends a new one)
*/
@@ -193,9 +193,9 @@ add_entry( byte *p, unsigned n, int mode, const char *info, const char *by )
/****************
* Check that the memory block is correct. The magic byte has already been
* checked. Checks which are done here:
- * - see wether the index points into our memory table
- * - see wether P is the same as the one stored in the table
- * - see wether we have already freed this block.
+ * - see whether the index points into our memory table
+ * - see whether P is the same as the one stored in the table
+ * - see whether we have already freed this block.
*/
struct memtbl_entry *
check_mem( const byte *p, const char *info )
diff --git a/util/strgutil.c b/util/strgutil.c
index f176d35dd..3e5999d43 100644
--- a/util/strgutil.c
+++ b/util/strgutil.c
@@ -75,7 +75,7 @@ strlist_last( STRLIST node )
/****************
* look for the substring SUB in buffer and return a pointer to that
* substring in BUF or NULL if not found.
- * Comparison is case-in-sensitive.
+ * Comparison is case-insensitive.
*/
const char *
memistr( const char *buf, size_t buflen, const char *sub )