[DVDnav-discuss] [PATCH 2/6] Make cosmetic changes to files.
Erik Hovland
erik at hovland.org
Fri Feb 13 20:21:29 CET 2009
Cosmetic fixes of spelling errors and some style inconsistencies.
Signed-off-by: Erik Hovland <erik at hovland.org>
---
msvc/include/pthreads/pthread.h | 6 +++---
msvc/include/sys/time.h | 2 +-
msvc/include/unistd.h | 4 ++--
src/dvd_reader.c | 18 +++++++++---------
src/dvdread/dvd_reader.h | 8 ++++----
src/dvdread/ifo_types.h | 2 +-
src/dvdread/nav_types.h | 8 ++++----
src/ifo_print.c | 22 +++++++++++-----------
8 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/msvc/include/pthreads/pthread.h b/msvc/include/pthreads/pthread.h
index c2c2caa..9bb3de4 100644
--- a/msvc/include/pthreads/pthread.h
+++ b/msvc/include/pthreads/pthread.h
@@ -196,7 +196,7 @@ extern "C"
* pthread_attr_setstackaddr
*
* _POSIX_THREAD_PRIORITY_SCHEDULING (set)
- * If set, you can use realtime scheduling.
+ * If set, you can use real-time scheduling.
* Indicates the availability of:
* pthread_attr_getinheritsched
* pthread_attr_getschedparam
@@ -393,7 +393,7 @@ enum {
PTHREAD_SCOPE_SYSTEM = 1, /* Default */
/*
- * pthread_setcancelstate paramters
+ * pthread_setcancelstate parameters
*/
PTHREAD_CANCEL_ENABLE = 0, /* Default */
PTHREAD_CANCEL_DISABLE = 1,
@@ -420,7 +420,7 @@ enum {
/*
* ====================
* ====================
- * Cancelation
+ * Cancellation
* ====================
* ====================
*/
diff --git a/msvc/include/sys/time.h b/msvc/include/sys/time.h
index f519f5a..f7973c1 100644
--- a/msvc/include/sys/time.h
+++ b/msvc/include/sys/time.h
@@ -20,7 +20,7 @@
* WIN32 PORT,
* by Matthew Grooms <elon at altavista.com>
*
- * sys/time.h - There is no seperate sys/time.h for win32 so we simply
+ * sys/time.h - There is no separate sys/time.h for win32 so we simply
* include the standard time header as well as our xine
* timer functions.
*/
diff --git a/msvc/include/unistd.h b/msvc/include/unistd.h
index 0f6cec7..620017c 100644
--- a/msvc/include/unistd.h
+++ b/msvc/include/unistd.h
@@ -21,7 +21,7 @@
* by Matthew Grooms <elon at altavista.com>
*
* unistd.h - This is mostly a catch all header that maps standard unix
- * libc calls to the equivelent win32 functions.
+ * libc calls to the equivalent win32 functions.
*
*/
@@ -63,7 +63,7 @@
#define snprintf _snprintf
#define vsnprintf _vsnprintf
-// FIXME : I dont remember why this is here
+// FIXME : I don't remember why this is here
#define readlink
#endif
diff --git a/src/dvd_reader.c b/src/dvd_reader.c
index 66289e7..408811d 100644
--- a/src/dvd_reader.c
+++ b/src/dvd_reader.c
@@ -249,7 +249,7 @@ static dvd_reader_t *DVDOpenImageFile( const char *location, int have_css )
if( have_css ) {
/* Only if DVDCSS_METHOD = title, a bit if it's disc or if
- * DVDCSS_METHOD = key but region missmatch. Unfortunaly we
+ * DVDCSS_METHOD = key but region mismatch. Unfortunately we
* don't have that information. */
dvd->css_state = 1; /* Need key init. */
@@ -304,7 +304,7 @@ static char *sun_block2char( const char *path )
#endif
#if defined(SYS_BSD)
-/* FreeBSD /dev/(r)(a)cd0c (a is for atapi), recomended to _not_ use r
+/* FreeBSD /dev/(r)(a)cd0c (a is for atapi), recommended to _not_ use r
OpenBSD /dev/rcd0c, it needs to be the raw device
NetBSD /dev/rcd0[d|c|..] d for x86, c (for non x86), perhaps others
Darwin /dev/rdisk0, it needs to be the raw device
@@ -415,7 +415,7 @@ dvd_reader_t *DVDOpen( const char *ppath )
#ifndef WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */
/* Also WIN32 does not have symlinks, so we don't need this bit of code. */
- /* Resolve any symlinks and get the absolut dir name. */
+ /* Resolve any symlinks and get the absolute dir name. */
{
char *new_path;
int cdir = open( ".", O_RDONLY );
@@ -425,9 +425,9 @@ dvd_reader_t *DVDOpen( const char *ppath )
close( cdir );
return NULL;
}
- new_path = malloc(PATH_MAX+1);
- if(!new_path) {
- free(path);
+ new_path = malloc( PATH_MAX + 1 );
+ if( new_path == NULL ) {
+ free( path );
return NULL;
}
if ( getcwd( new_path, PATH_MAX ) == NULL ) {
@@ -445,15 +445,15 @@ dvd_reader_t *DVDOpen( const char *ppath )
return NULL;
}
close( cdir );
- free( path_copy );
- path_copy = new_path;
+ free( path_copy );
+ path_copy = new_path;
}
}
#endif
/**
* If we're being asked to open a directory, check if that directory
- * is the mountpoint for a DVD-ROM which we can use instead.
+ * is the mount point for a DVD-ROM which we can use instead.
*/
if( strlen( path_copy ) > 1 ) {
diff --git a/src/dvdread/dvd_reader.h b/src/dvdread/dvd_reader.h
index 8a2a58d..93c5d2f 100644
--- a/src/dvdread/dvd_reader.h
+++ b/src/dvdread/dvd_reader.h
@@ -86,8 +86,8 @@ typedef struct dvd_file_s dvd_file_t;
* path/VTS_01_1.VOB
* path/vts_01_1.vob
*
- * @param path Specifies the the device, file or directory to be used.
- * @return If successful a a read handle is returned. Otherwise 0 is returned.
+ * @param path Specifies the device, file or directory to be used.
+ * @return If successful a read handle is returned. Otherwise 0 is returned.
*
* dvd = DVDOpen(path);
*/
@@ -126,7 +126,7 @@ typedef enum {
* @param dvd A dvd read handle.
* @param titlenum Which Video Title Set should be used, VIDEO_TS is 0.
* @param domain Which domain.
- * @return If successful a a file read handle is returned, otherwise 0.
+ * @return If successful a file read handle is returned, otherwise 0.
*
* dvd_file = DVDOpenFile(dvd, titlenum, domain); */
dvd_file_t *DVDOpenFile( dvd_reader_t *, int, dvd_read_domain_t );
@@ -174,7 +174,7 @@ int32_t DVDFileSeek( dvd_file_t *, int32_t );
/**
* Reads the given number of bytes from the file. This call can only be used
* on the information files, and may not be used for reading from a VOB. This
- * reads from and increments the currrent seek position for the file.
+ * reads from and increments the current seek position for the file.
*
* @param dvd_file A file read handle.
* @param data Pointer to a buffer to write the data into.
diff --git a/src/dvdread/ifo_types.h b/src/dvdread/ifo_types.h
index b28fe7f..7130699 100644
--- a/src/dvdread/ifo_types.h
+++ b/src/dvdread/ifo_types.h
@@ -558,7 +558,7 @@ typedef struct {
uint8_t unknown1;
uint8_t unknown2;
uint8_t unknown3;
- uint8_t unknown4; /* ?? allways 0x30 language?, text format? */
+ uint8_t unknown4; /* ?? always 0x30 language?, text format? */
uint8_t unknown5;
uint16_t offset; /* from first */
diff --git a/src/dvdread/nav_types.h b/src/dvdread/nav_types.h
index aa36b52..9aef6b1 100644
--- a/src/dvdread/nav_types.h
+++ b/src/dvdread/nav_types.h
@@ -73,7 +73,7 @@ typedef struct {
* 1XXb: pan&scan buttons
*/
typedef struct {
- uint16_t hli_ss; /**< status, only low 2 bits 0: no buttons, 1: different 2: equal 3: eual except for button cmds */
+ uint16_t hli_ss; /**< status, only low 2 bits 0: no buttons, 1: different 2: equal 3: equal except for button cmds */
uint32_t hli_s_ptm; /**< start ptm of hli */
uint32_t hli_e_ptm; /**< end ptm of hli */
uint32_t btn_se_e_ptm; /**< end ptm of button select */
@@ -96,7 +96,7 @@ typedef struct {
/**
* Button Color Information Table
- * Each entry beeing a 32bit word that contains the color indexs and alpha
+ * Each entry being a 32bit word that contains the color indexes and alpha
* values to use. They are all represented by 4 bit number and stored
* like this [Ci3, Ci2, Ci1, Ci0, A3, A2, A1, A0]. The actual palette
* that the indexes reference is in the PGC.
@@ -192,7 +192,7 @@ typedef struct {
} ATTRIBUTE_PACKED sml_pbi_t;
/**
- * Seamless Angle Infromation for one angle
+ * Seamless Angle Information for one angle
*/
typedef struct {
uint32_t address; /**< offset to next ILVU, high bit is before/after */
@@ -200,7 +200,7 @@ typedef struct {
} ATTRIBUTE_PACKED sml_agl_data_t;
/**
- * Seamless Angle Infromation
+ * Seamless Angle Information
*/
typedef struct {
sml_agl_data_t data[9];
diff --git a/src/ifo_print.c b/src/ifo_print.c
index 4863b1b..68e4ce3 100644
--- a/src/ifo_print.c
+++ b/src/ifo_print.c
@@ -130,7 +130,7 @@ static void ifo_print_video_attributes(int level, video_attr_t *attr) {
printf("(please send a bug report), ");
}
- // Wide is allways allowed..!!!
+ // Wide is always allowed..!!!
switch(attr->permitted_df) {
case 0:
printf("pan&scan+letterboxed, ");
@@ -328,7 +328,7 @@ static void ifo_print_audio_attributes(int level, audio_attr_t *attr) {
case 1: // Normal audio
printf("Normal Caption ");
break;
- case 2: // visually imparied
+ case 2: // visually impaired
printf("Audio for visually impaired ");
break;
case 3: // Directors 1
@@ -685,7 +685,7 @@ static void ifoPrint_CELL_PLAYBACK(cell_playback_t *cell_playback, int nr) {
break;
case 2:
case 3:
- printf("(send bug repport) ");
+ printf("(send bug report) ");
break;
}
}
@@ -781,7 +781,7 @@ void ifoPrint_PGC(pgc_t *pgc) {
}
}
- /* Memmory offsets to div. tables. */
+ /* Memory offsets to div. tables. */
ifoPrint_PGC_COMMAND_TBL(pgc->command_tbl);
ifoPrint_PGC_PROGRAM_MAP(pgc->program_map, pgc->nr_of_programs);
ifoPrint_CELL_PLAYBACK(pgc->cell_playback, pgc->nr_of_cells);
@@ -806,7 +806,7 @@ void ifoPrint_TT_SRPT(tt_srpt_t *tt_srpt) {
printf("\tTitle playback type: (%02x)\n",
*(uint8_t *)&(tt_srpt->title[i].pb_ty));
printf("\t\t%s\n",
- tt_srpt->title[i].pb_ty.multi_or_random_pgc_title ? "Random or Shuffle" : "Sequencial");
+ tt_srpt->title[i].pb_ty.multi_or_random_pgc_title ? "Random or Shuffle" : "Sequential");
if (tt_srpt->title[i].pb_ty.jlc_exists_in_cell_cmd) printf("\t\tJump/Link/Call exists in cell cmd\n");
if (tt_srpt->title[i].pb_ty.jlc_exists_in_prepost_cmd) printf("\t\tJump/Link/Call exists in pre/post cmd\n");
if (tt_srpt->title[i].pb_ty.jlc_exists_in_button_cmd) printf("\t\tJump/Link/Call exists in button cmd\n");
@@ -1109,7 +1109,7 @@ void ifo_print(dvd_reader_t *dvd, int title) {
printf("No PGCI Unit table present\n");
}
- printf("\nParental Manegment Information table\n");
+ printf("\nParental Management Information table\n");
printf( "------------------------------------\n");
if(ifohandle->ptl_mait) {
ifoPrint_PTL_MAIT(ifohandle->ptl_mait);
@@ -1129,12 +1129,12 @@ void ifo_print(dvd_reader_t *dvd, int title) {
printf("No Text Data Manager Information present\n");
}
- printf("\nMenu Cell Adress table\n");
+ printf("\nMenu Cell Address table\n");
printf( "-----------------\n");
if(ifohandle->menu_c_adt) {
ifoPrint_C_ADT(ifohandle->menu_c_adt);
} else {
- printf("No Menu Cell Adress table present\n");
+ printf("No Menu Cell Address table present\n");
}
printf("\nVideo Manager Menu VOBU address map\n");
@@ -1176,12 +1176,12 @@ void ifo_print(dvd_reader_t *dvd, int title) {
printf("No VTS Time Map table present\n");
}
- printf("\nMenu Cell Adress table\n");
+ printf("\nMenu Cell Address table\n");
printf( "-----------------\n");
if(ifohandle->menu_c_adt) {
ifoPrint_C_ADT(ifohandle->menu_c_adt);
} else {
- printf("No Cell Adress table present\n");
+ printf("No Cell Address table present\n");
}
printf("\nVideo Title Set Menu VOBU address map\n");
@@ -1192,7 +1192,7 @@ void ifo_print(dvd_reader_t *dvd, int title) {
printf("No Menu VOBU address map present\n");
}
- printf("\nCell Adress table\n");
+ printf("\nCell Address table\n");
printf( "-----------------\n");
ifoPrint_C_ADT(ifohandle->vts_c_adt);
More information about the DVDnav-discuss
mailing list