From: Andre Noll Date: Fri, 28 Sep 2007 21:46:36 +0000 (+0200) Subject: Still more typo fixes. X-Git-Tag: v0.3.0~330 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=15d21005beb3b173ba9909e522782201fdf0d5b8 Still more typo fixes. --- diff --git a/afs.cmd b/afs.cmd index f29eae07..cb8b671e 100644 --- a/afs.cmd +++ b/afs.cmd @@ -125,7 +125,7 @@ H: H: Options: H: H: -a Run audio file table checks. Checks for entries in the audio file -H: table which are not present in the filesystem. Moreover, it checks +H: table which are not present in the file system. Moreover, it checks H: whether the lyrics id and all entries in the audio file table are H: valid. H: @@ -164,7 +164,7 @@ H: a slash (see fnmatch(3)). --- N: touch P: AFS_READ | AFS_WRITE -D: Manupulate the afs data for all audio files matching a pattern. +D: Manipulate the afs data for all audio files matching a pattern. U: touch [-n numplayed] [-l lastplayed] [-y lyrics_id] [-i image_id] [-v] [-p] pattern H: If no option is given, lastplayed is set to the current time and numplayed is H: increased by one. Otherwise, only the given options are taken into account. @@ -175,7 +175,7 @@ H: -n Set numplayed count. The number of times afs has selected this H: audio file for streaming. H: H: -l Set lastplayed time. The last time this audio file was selected. -H: Must be given as the number of sectonds since the epoch. Example: +H: Must be given as the number of seconds since the epoch. Example: H: H: touch -l $(date +%s) file H: diff --git a/afs.h b/afs.h index 9628d5c7..72081ab6 100644 --- a/afs.h +++ b/afs.h @@ -12,7 +12,7 @@ struct afs_info { /** Seconds since the epoch. */ uint64_t last_played; - /** Bitfield of set attributes. */ + /** Bit field of set attributes. */ uint64_t attributes; /** Counts how many times the file was selected. */ uint32_t num_played; diff --git a/audiod.h b/audiod.h index 3f481460..ca22160d 100644 --- a/audiod.h +++ b/audiod.h @@ -51,7 +51,7 @@ struct audiod_command { /** * describes one instance of a receiver-filter-writer chain * - * \sa receier_node, receiver, filter, filter_node, filter_chain, writer, + * \sa receiver_node, receiver, filter, filter_node, filter_chain, writer, * writer_node, writer_node_group. */ struct slot_info { diff --git a/osl.c b/osl.c index 48f25a1f..6e3eeca6 100644 --- a/osl.c +++ b/osl.c @@ -17,7 +17,7 @@ /** * A wrapper for lseek(2). * - * \param fd The filedescriptor whose offset is to be to repositioned. + * \param fd The file descriptor whose offset is to be to repositioned. * \param offset A value-result parameter. * \param whence Usual repositioning directive. * @@ -46,8 +46,8 @@ int para_lseek(int fd, off_t *offset, int whence) * \param buf The buffer to write. * \param size The length of \a buf in bytes. * - * This function writes out the given bufffer and retries if an interrupt - * occured during the write. + * This function writes out the given buffer and retries if an interrupt + * occurred during the write. * * \return On success, the number of bytes written is returned, otherwise, the * function returns \p -E_WRITE. @@ -1085,7 +1085,7 @@ void clear_rbtrees(struct osl_table *t) * \param flags Options for what should be cleaned up. * * If osl_open_table() succeeds, the resulting table pointer must later be - * passed to this function in order to flush all changes to the filesystem and + * passed to this function in order to flush all changes to the file system and * to free the resources that were allocated by osl_open_table(). * * \return Positive on success, negative on errors. Possible errors: \p E_BAD_TABLE, @@ -1667,7 +1667,7 @@ static int check_rbtree_col(const struct osl_table *t, unsigned col_num, * Lookup \a obj in \a t and return the row containing \a obj. The column * specified by \a col_num must have an associated rbtree. * - * \return Positive on success, negative on errors. If an error occured, \a + * \return Positive on success, negative on errors. If an error occurred, \a * result is set to \p NULL. Possible errors include: \p E_BAD_TABLE, \p * E_BAD_STORAGE_FLAGS, errors returned by get_mapped_object(), \p * E_RB_KEY_NOT_FOUND. @@ -1835,7 +1835,7 @@ out: * * This function gets rid of all references to the old object. This includes * removal of the rbtree node in case there is an rbtree associated with \a - * col_num. It then inserts \a obj into the table and the rbtree if neccessary. + * col_num. It then inserts \a obj into the table and the rbtree if necessary. * * If the \p OSL_RBTREE flag is set for \a col_num, you \b MUST call this * function in order to change the contents of an object, even for volatile or diff --git a/osl.h b/osl.h index b0ad7391..2fdee777 100644 --- a/osl.h +++ b/osl.h @@ -7,7 +7,7 @@ /** \file osl.h User interface for the object storage layer. */ -/** decribes an object of the object storage layer (osl) */ +/** describes an object of the object storage layer (osl) */ struct osl_object { /** Pointer to the data of the object. */ void *data; @@ -93,7 +93,7 @@ struct osl_column_description { char *name; /** * For columns with an associated rbtree, this must point to a function - * that compares the values of two objects, either a builtin function + * that compares the values of two objects, either a built-in function * or a function defined by the application may be supplied. This * field is ignored if the column does not have an associated rbtree. * @@ -124,7 +124,7 @@ struct osl_table_description { uint16_t num_columns; /** Further table-wide information. */ enum osl_table_flags flags; - /** The array desribing the individual columns of the table. */ + /** The array describing the individual columns of the table. */ struct osl_column_description *column_descriptions; }; diff --git a/server.cmd b/server.cmd index fe6328f6..da895480 100644 --- a/server.cmd +++ b/server.cmd @@ -31,7 +31,7 @@ N: help P: 0 D: print help text U: help [command] -H: Without any arguments, help prints a list of availible commands. When +H: Without any arguments, help prints a list of available commands. When H: issued with a command name as first argument, print out a description H: for that command. ---