multi use: call multi_perform even on select() timeouts

diff --git a/docs/examples/fopen.c b/docs/examples/fopen.c
index 1310993bd54acaddb5fbe33fe38b97e4058b63e3..874d380d77a45bca30fa81f6be858501305b9522 100644 (file)
--- a/docs/examples/fopen.c
+++ b/docs/examples/fopen.c
@@ -180,12 +180,9 @@ fill_buffer(URL_FILE *file,int want,int waittime)
             break;
 
         case 0:
-            break;
-
-        default:
-            /* timeout or readable/writable sockets */
-            curl_multi_perform(multi_handle, &file->still_running);
-            break;
+          /* timeout or readable/writable sockets */
+          curl_multi_perform(multi_handle, &file->still_running);
+          break;
         }
     } while(file->still_running && (file->buffer_pos < want));
     return 1;

diff --git a/docs/examples/multi-app.c b/docs/examples/multi-app.c
index 09b91b7205e839bf4626a55d0ddfe7685c6589b2..6ba131830dcfdbc7b463f06fa62c53cfb8b4a9c9 100644 (file)
--- a/docs/examples/multi-app.c
+++ b/docs/examples/multi-app.c
@@ -101,12 +101,8 @@ int main(int argc, char **argv)
     case -1:
       /* select error */
       break;
-    case 0:
-      /* timeout, do something else */
-      break;
-    default:
-      /* one or more of curl's file descriptors say there's data to read
-         or write */
+    case 0: /* timeout */
+    default: /* action */
       curl_multi_perform(multi_handle, &still_running);
       break;
     }

diff --git a/docs/examples/multi-post.c b/docs/examples/multi-post.c
index d2daf70a60e8cd2cc52fdbcf505b959ecbd6c972..8b4f03e9e335ead0fd3ee9ca6b8dfa9c445a5094 100644 (file)
--- a/docs/examples/multi-post.c
+++ b/docs/examples/multi-post.c
@@ -112,7 +112,6 @@ int main(int argc, char *argv[])
         /* select error */
         break;
       case 0:
-        printf("timeout!\n");
       default:
         /* timeout or readable/writable sockets */
         printf("perform!\n");

diff --git a/docs/examples/smtp-multi.c b/docs/examples/smtp-multi.c
index 0a7aeebf950b1b442a684ada6a6a26905e75ed4e..239172ba985481bb60ceb10048d315e5b22be251 100644 (file)
--- a/docs/examples/smtp-multi.c
+++ b/docs/examples/smtp-multi.c
@@ -174,12 +174,8 @@ int main(void)
     case -1:
       /* select error */
       break;
-    case 0:
-      /* timeout, do something else */
-      break;
-    default:
-      /* one or more of curl's file descriptors say there's data to read
-         or write */
+    case 0: /* timeout */
+    default: /* action */
       curl_multi_perform(mcurl, &still_running);
       break;
     }