libetherpix

@@ -62,11 +62,13 @@ bool cbEntity(const class dimeState * const state, class dimeEntity *entity,

     pLayer = &gLayerNetwork;

   else if (strLayerName.substr(0, 6) == "cable ") {

     unsigned int no = 0;

-    sscanf(strLayerName.substr(6).c_str(), "%x", &no);

+    if (sscanf(strLayerName.substr(6).c_str(), "%x", &no) != 1)

+      no = 0; // cable 0 by default

     pLayer = &gLayerCables[no];

   } else if (strLayerName.substr(0, 12) == "distributor ") {

     unsigned int no = 0;

-    sscanf(strLayerName.substr(12).c_str(), "%x", &no);

+    if (sscanf(strLayerName.substr(12).c_str(), "%x", &no) != 1)

+      no = 0; // distributor 0 by default

     pLayer = &gLayerDistributors[no];

   }

   else

@@ -105,7 +105,8 @@ int main(int argc, char *argv[])

     /* wait for user input */

     printf("> ");

-    scanf("%50s", line);

+    if (scanf("%50s", line) != 1)

+      break;

     if (line[0] == 0 || (line[0] == '.' && line[1] == 0))

       break;

@@ -23,7 +23,7 @@

 #include <string.h>

 #ifdef WINDOWS

-extern inline char * strerror_r(int errnum, char *buf, size_t buflen)

+static inline char * strerror_r(int errnum, char *buf, size_t buflen)

 {

   strncpy(buf, strerror(errnum), buflen);

   if (buflen >= 1)

@@ -52,7 +52,7 @@ typedef uint16_t in_port_t;

 #ifndef WINDOWS

 /** closesocket() only exists for Windows,other OSes just use close() */

-extern inline int closesocket(int fd)

+static inline int closesocket(int fd)

 {

   return close(fd);

 }

@@ -63,7 +63,7 @@ extern inline int closesocket(int fd)

  * \param[in] sock socket descriptor to check

  * \return 1 if valid, 0 if not valid

  */

-extern inline int flp_sock_is_valid(flp_sock_t sock)

+static inline int flp_sock_is_valid(flp_sock_t sock)

 {

 #ifdef WINDOWS

   return sock != INVALID_SOCKET;

@@ -77,7 +77,7 @@ extern inline int flp_sock_is_valid(flp_sock_t sock)

  * \param[in] buf pointer to buffer to place text into

  * \param[in] buflen size of buffer

  */

-extern inline void flp_sock_get_last_error(char *buf, size_t buflen)

+static inline void flp_sock_get_last_error(char *buf, size_t buflen)

 {

 #ifdef WINDOWS

   int err = WSAGetLastError();

@@ -71,7 +71,7 @@ typedef pthread_cond_t flp_thread_cond_t;

  * \param[in] p_data user data pointer

  * \return 1 if successful, 0 on error

  */

-extern inline int flp_thread_create(flp_thread_id_t *p_tid,

+static inline int flp_thread_create(flp_thread_id_t *p_tid,

                                     FLP_THREAD_FUNC(*func),

                                     void * p_data)

 {

@@ -89,7 +89,7 @@ extern inline int flp_thread_create(flp_thread_id_t *p_tid,

  * \brief join a thread

  * \param[in] tid thread ID

  */

-extern inline void flp_thread_join(flp_thread_id_t tid)

+static inline void flp_thread_join(flp_thread_id_t tid)

 {

 #ifdef WINDOWS

   WaitForSingleObject(tid, INFINITE);

@@ -104,7 +104,7 @@ extern inline void flp_thread_join(flp_thread_id_t tid)

  * \param[in] *p_mtx mutex variable

  * \return 1 if successful, 0 on error

  */

-extern inline int flp_thread_mutex_init(flp_thread_mutex_t *p_mtx)

+static inline int flp_thread_mutex_init(flp_thread_mutex_t *p_mtx)

 {

 #ifdef WINDOWS

   HANDLE h = CreateMutex(NULL, FALSE, NULL);

@@ -120,7 +120,7 @@ extern inline int flp_thread_mutex_init(flp_thread_mutex_t *p_mtx)

  * \brief destroy mutex

  * \param[in] *p_mtx mutex variable

  */

-extern inline void flp_thread_mutex_destroy(flp_thread_mutex_t *p_mtx)

+static inline void flp_thread_mutex_destroy(flp_thread_mutex_t *p_mtx)

 {

 #ifdef WINDOWS

   CloseHandle(*p_mtx);

@@ -133,7 +133,7 @@ extern inline void flp_thread_mutex_destroy(flp_thread_mutex_t *p_mtx)

  * \brief lock mutex

  * \param[in] *p_mtx mutex variable

  */

-extern inline void flp_thread_mutex_lock(flp_thread_mutex_t *p_mtx)

+static inline void flp_thread_mutex_lock(flp_thread_mutex_t *p_mtx)

 {

 #ifdef WINDOWS

   WaitForSingleObject(*p_mtx, INFINITE);

@@ -146,7 +146,7 @@ extern inline void flp_thread_mutex_lock(flp_thread_mutex_t *p_mtx)

  * \brief unlock mutex

  * \param[in] *p_mtx mutex variable

  */

-extern inline void flp_thread_mutex_unlock(flp_thread_mutex_t *p_mtx)

+static inline void flp_thread_mutex_unlock(flp_thread_mutex_t *p_mtx)

 {

 #ifdef WINDOWS

   ReleaseMutex(*p_mtx);

@@ -160,7 +160,7 @@ extern inline void flp_thread_mutex_unlock(flp_thread_mutex_t *p_mtx)

  * \param[in] *p_cond conition variable

  * \return 1 if successful, 0 on error

  */

-extern inline int flp_thread_cond_init(flp_thread_cond_t *p_cond)

+static inline int flp_thread_cond_init(flp_thread_cond_t *p_cond)

 {

 #ifdef WINDOWS

   HANDLE h = CreateEvent(NULL, FALSE, FALSE, NULL);

@@ -176,7 +176,7 @@ extern inline int flp_thread_cond_init(flp_thread_cond_t *p_cond)

  * \brief destroy condition

  * \param[in] *p_cond condition variable

  */

-extern inline void flp_thread_cond_destroy(flp_thread_cond_t *p_cond)

+static inline void flp_thread_cond_destroy(flp_thread_cond_t *p_cond)

 {

 #ifdef WINDOWS

   CloseHandle(*p_cond);

@@ -189,7 +189,7 @@ extern inline void flp_thread_cond_destroy(flp_thread_cond_t *p_cond)

  * \brief signal condition

  * \param[in] *p_cond condition variable

  */

-extern inline void flp_thread_cond_signal(flp_thread_cond_t *p_cond)

+static inline void flp_thread_cond_signal(flp_thread_cond_t *p_cond)

 {

 #ifdef WINDOWS

   SetEvent(*p_cond);

@@ -203,7 +203,7 @@ extern inline void flp_thread_cond_signal(flp_thread_cond_t *p_cond)

  * \param[in] *p_cond condition variable

  * \param[in] *p_mtx mutex variable to unlock while waiting

  */

-extern inline void flp_thread_cond_wait(flp_thread_cond_t *p_cond,

+static inline void flp_thread_cond_wait(flp_thread_cond_t *p_cond,

                                         flp_thread_mutex_t *p_mtx)

 {

 #ifdef WINDOWS

@@ -225,7 +225,7 @@ extern inline void flp_thread_cond_wait(flp_thread_cond_t *p_cond,

  * \param[in] millisecs number of milliseconds to wait at most

  * \return 0 for condition singnaled, 1 for timeout

  */

-extern inline int flp_thread_cond_timedwait(flp_thread_cond_t *p_cond,

+static inline int flp_thread_cond_timedwait(flp_thread_cond_t *p_cond,

                                             flp_thread_mutex_t *p_mtx,

                                             struct timeval *p_now,

                                             unsigned int millisecs)

@@ -688,7 +688,8 @@ int flp_config_proc_file(flp_display_t *p_display,

     /* read a line */

     line[0] = 0;

-    fgets(line, sizeof (line), file);

+    if (fgets(line, sizeof (line), file) == NULL)

+      break;

     p_lf = strchr(line, '\n'); /* find LF in line in replace it with 0 */

     if (p_lf)

       *p_lf = 0;

@@ -702,7 +703,8 @@ int flp_config_proc_file(flp_display_t *p_display,

         /* jump over in rest of line */

         dummy[0] = 0;

         while (!feof(file) && !strchr(dummy, '\n'))

-          fgets(dummy, sizeof (dummy), file);

+          if (fgets(dummy, sizeof (dummy), file) == NULL)

+            break;

       }

     }