some minor code cleaning issues

3 files changed, 49 insertions, 33 deletions

diff --git a/src/examples/demo_https.c b/src/examples/demo_https.c
index 88b01bbf..d5542eab 100644
--- a/src/examples/demo_https.c
+++ b/src/examples/demo_https.c
@@ -561,7 +561,7 @@ process_upload_data (void *cls,
                 uc->category,
                 filename);
       for (i=strlen (fn)-1;i>=0;i--)
-        if (! isprint ((int) fn[i]))
+        if (! isprint ((unsigned char) fn[i]))
           fn[i] = '_';
       uc->fd = open (fn,
                      O_CREAT | O_EXCL
diff --git a/src/examples/querystring_example.c b/src/examples/querystring_example.c
index 3d91bcea..db0d6f1a 100644
--- a/src/examples/querystring_example.c
+++ b/src/examples/querystring_example.c
@@ -77,16 +77,24 @@ int
 main (int argc, char *const *argv)
 {
   struct MHD_Daemon *d;
+  int port;
 
   if (argc != 2)
     {
       printf ("%s PORT\n", argv[0]);
       return 1;
     }
+  port = atoi (argv[1]);
+  if ( (port < 0) ||
+       (port > UINT16_MAX) )
+    {
+      printf ("%s PORT\n", argv[0]);
+      return 1;
+    }
   d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
-                        atoi (argv[1]),
+                        (uint16_t) port,
                         NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
-  if (d == NULL)
+  if (NULL == d)
     return 1;
   (void) getc (stdin);
   MHD_stop_daemon (d);
diff --git a/src/examples/suspend_resume_epoll.c b/src/examples/suspend_resume_epoll.c
index adff673c..4007cc94 100644
--- a/src/examples/suspend_resume_epoll.c
+++ b/src/examples/suspend_resume_epoll.c
@@ -54,69 +54,77 @@ ahc_echo (void *cls,
   int ret;
   struct Request* req;
   struct itimerspec ts;
-  (void)url;               /* Unused. Silence compiler warning. */
-  (void)version;           /* Unused. Silence compiler warning. */
-  (void)upload_data;       /* Unused. Silence compiler warning. */
-  (void)upload_data_size;  /* Unused. Silence compiler warning. */
 
+  (void) url;               /* Unused. Silence compiler warning. */
+  (void) version;           /* Unused. Silence compiler warning. */
+  (void) upload_data;       /* Unused. Silence compiler warning. */
+  (void) upload_data_size;  /* Unused. Silence compiler warning. */
   req = *ptr;
-  if (!req)
+  if (NULL == req)
   {
 
-    req = malloc(sizeof(struct Request));
+    req = malloc (sizeof(struct Request));
+    if (NULL == req)
+      return MHD_NO;
     req->connection = connection;
-    req->timerfd = 0;
+    req->timerfd = -1;
     *ptr = req;
     return MHD_YES;
   }
 
-  if (req->timerfd)
+  if (-1 != req->timerfd)
   {
     // send response (echo request url)
     response = MHD_create_response_from_buffer (strlen (url),
                                                 (void *) url,
                                                 MHD_RESPMEM_MUST_COPY);
-    ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+    if (NULL == response)
+      return MHD_NO;
+    ret = MHD_queue_response (connection,
+                              MHD_HTTP_OK,
+                              response);
     MHD_destroy_response (response);
     return ret;
   }
-  else
-  {
-    // create timer and suspend connection
-    req->timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK);
-    if (-1 == req->timerfd)
+  // create timer and suspend connection
+  req->timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK);
+  if (-1 == req->timerfd)
     {
       printf("timerfd_create: %s", strerror(errno));
       return MHD_NO;
     }
-    evt.events = EPOLLIN;
-    evt.data.ptr = req;
-    if (-1 == epoll_ctl(epfd, EPOLL_CTL_ADD, req->timerfd, &evt))
+  evt.events = EPOLLIN;
+  evt.data.ptr = req;
+  if (-1 == epoll_ctl(epfd, EPOLL_CTL_ADD, req->timerfd, &evt))
     {
       printf("epoll_ctl: %s", strerror(errno));
       return MHD_NO;
     }
-    ts.it_value.tv_sec = 1;
-    ts.it_value.tv_nsec = 0;
-    ts.it_interval.tv_sec = 0;
-    ts.it_interval.tv_nsec = 0;
-    if (-1 == timerfd_settime(req->timerfd, 0, &ts, NULL))
+  ts.it_value.tv_sec = 1;
+  ts.it_value.tv_nsec = 0;
+  ts.it_interval.tv_sec = 0;
+  ts.it_interval.tv_nsec = 0;
+  if (-1 == timerfd_settime(req->timerfd, 0, &ts, NULL))
     {
       printf("timerfd_settime: %s", strerror(errno));
       return MHD_NO;
     }
-    MHD_suspend_connection(connection);
-    return MHD_YES;
-  }
+  MHD_suspend_connection(connection);
+  return MHD_YES;
 }
 
 
-static int
-connection_done(struct MHD_Connection *connection,
-                void **con_cls,
-                enum MHD_RequestTerminationCode toe)
+static void
+connection_done (void *cls,
+                 struct MHD_Connection *connection,
+                 void **con_cls,
+                 enum MHD_RequestTerminationCode toe)
 {
-  free(*con_cls);
+  struct Request *req = *con_cls;
+
+  if (-1 != req->timerfd)
+    close (req->timerfd);
+  free(req);
 }