diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config_lib.h | 26 | ||||
| -rw-r--r-- | src/scandir_posix.c | 26 |
2 files changed, 26 insertions, 26 deletions
diff --git a/src/config_lib.h b/src/config_lib.h index 56bc8af91..929fa7c39 100644 --- a/src/config_lib.h +++ b/src/config_lib.h @@ -3,7 +3,7 @@ * * Configuration file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2011 by Bill Spitzak and others. + * Copyright 1998-2016 by Bill Spitzak and others. */ #ifndef FL_CONFIG_LIB_H @@ -12,10 +12,10 @@ #include <config.h> -// find the right graphics configuration +/* find the right graphics configuration */ #if !defined(FL_CFG_GFX_XLIB) && !defined(FL_CFG_GFX_QUARTZ) && !defined(FL_CFG_GFX_GDI) -#ifdef __APPLE__ // default configurations +#ifdef __APPLE__ /* default configurations */ # define FL_CFG_GFX_QUARTZ # ifdef HAVE_GL # define FL_CFG_GFX_OPENGL @@ -27,7 +27,7 @@ # endif #elif defined(FL_PORTING) # pragma message "FL_PORTING: please choose a core graphics library" -#else // X11 +#else /* X11 */ # define FL_CFG_GFX_XLIB # ifdef HAVE_GL # define FL_CFG_GFX_OPENGL @@ -37,48 +37,48 @@ #endif -// find the right printer driver configuration +/* find the right printer driver configuration */ #if !defined(FL_CFG_PRN_PS) && !defined(FL_CFG_PRN_QUARTZ) && !defined(FL_CFG_PRN_WIN32) -#ifdef __APPLE__ // default configurations +#ifdef __APPLE__ /* default configurations */ # define FL_CFG_PRN_QUARTZ #elif defined(WIN32) # define FL_CFG_PRN_WIN32 #elif defined(FL_PORTING) # pragma message "FL_PORTING: please choose a printer driver" -#else // X11 +#else /* X11 */ # define FL_CFG_PRN_PS #endif #endif -// find the right window manager configuration +/* find the right window manager configuration */ #if !defined(FL_CFG_WIN_X11) && !defined(FL_CFG_WIN_COCOA) && !defined(FL_CFG_WIN_WIN32) -#ifdef __APPLE__ // default configurations +#ifdef __APPLE__ /* default configurations */ # define FL_CFG_WIN_COCOA #elif defined(WIN32) # define FL_CFG_WIN_WIN32 #elif defined(FL_PORTING) # pragma message "FL_PORTING: please choose a window management library" -#else // X11 +#else /* X11 */ # define FL_CFG_WIN_X11 #endif #endif -// find the right system configuration +/* find the right system configuration */ #if !defined(FL_CFG_SYS_POSIX) && !defined(FL_CFG_SYS_WIN32) -#ifdef __APPLE__ // default configurations +#ifdef __APPLE__ /* default configurations */ # define FL_CFG_SYS_POSIX #elif defined(WIN32) # define FL_CFG_SYS_WIN32 #elif defined(FL_PORTING) # pragma message "FL_PORTING: please choose a system library" -#else // X11 +#else /* X11 */ # define FL_CFG_SYS_POSIX #endif diff --git a/src/scandir_posix.c b/src/scandir_posix.c index ec0c84173..5daa7f5e2 100644 --- a/src/scandir_posix.c +++ b/src/scandir_posix.c @@ -26,7 +26,7 @@ * The POSIX.1c-1995 extension is required if 'HAVE_PTHREAD' is defined. * * Note: - * In theory, a system that provide threads should also provide 'readdir_r()', + * In theory, a system that provides threads should also provide 'readdir_r()', * a thread-safe version of 'readdir()'. In reality this is not always the case. * In addition there may be a race condition that can lead to a buffer overflow: * http://womble.decadent.org.uk/readdir_r-advisory.html @@ -69,16 +69,16 @@ static pthread_mutex_t scandir_mutex = PTHREAD_MUTEX_INITIALIZER; /* ========================================================================== */ /* * This function reads the next entry from the directory referenced by 'dirp', - * allocate a buffer for the entry and copy it into this buffer. - * A pointer to this buffer is written to 'entryp' and the size of the buffer is - * written to 'len'. + * allocates a buffer for the entry and copies it into this buffer. + * A pointer to this buffer is written to 'entryp' and the size of the buffer + * is written to 'len'. * Success and a NULL pointer is returned for 'entryp' if there are no more * entries in the directory. - * On sucess zero is returned and the caller is responsible for 'free()'ing the - * buffer after use. + * On success zero is returned and the caller is responsible for 'free()'ing + * the buffer after use. * On error the return value is nonzero, 'entryp' and 'len' are invalid. * - * Should be declared as 'static inline' if the compiler support that. + * Should be declared as 'static inline' if the compiler supports that. */ static int readentry(DIR *dirp, struct dirent **entryp, size_t *len) @@ -89,7 +89,7 @@ readentry(DIR *dirp, struct dirent **entryp, size_t *len) #ifdef HAVE_PTHREAD if (!pthread_mutex_lock(&scandir_mutex)) { - /* Ensure that there is no code path that bypass the '_unlock()' call! */ + /* Ensure that there is no code path that bypasses the '_unlock()' call! */ #endif /* HAVE_PTHREAD */ errno = 0; e = readdir(dirp); @@ -118,7 +118,7 @@ readentry(DIR *dirp, struct dirent **entryp, size_t *len) } #ifdef HAVE_PTHREAD /* - * In a multithreading environment the systems dirent buffer may be shared + * In a multithreading environment the system's dirent buffer may be shared * between all threads. Therefore the mutex must stay locked until we have * copied the data to our thread local buffer. */ @@ -177,10 +177,10 @@ fl_scandir(const char *dir, struct dirent ***namelist, } closedir(dirp); /* - * A standard compliant 'closedir()' is allowed to fail with 'EINTR', but - * the state of the directory structure is undefined in this case. + * A standard compliant 'closedir()' is allowed to fail with 'EINTR', + * but the state of the directory structure is undefined in this case. * Therefore we ignore the return value because we can't call 'closedir()' - * again and must hope that the system has released all ressources. + * again and must hope that the system has released all resources. */ } /* Sort entries in array if there is a compare function provided */ @@ -203,7 +203,7 @@ fl_scandir(const char *dir, struct dirent ***namelist, return result; } -#endif // defined(USE_X11) && !defined(HAVE_SCANDIR) +#endif /* defined(USE_X11) && !defined(HAVE_SCANDIR) */ /* * End of "$Id$". |