diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-08-20 12:27:50 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-08-20 23:13:19 +0200 |
| commit | 19122c07682c268c2383218f62e09c3d24a41e76 (patch) | |
| tree | 7ada8e345488863936046a5343e5a83a73c03b30 /lib | |
| parent | c346c4c8f9503239ad3b5f2ba1cca9a317707e88 (diff) | |
CURLM_ADDED_ALREADY: new error code
Doing curl_multi_add_handle() on an easy handle that is already added to
a multi handle now returns this error code. It previously returned
CURLM_BAD_EASY_HANDLE for this condition.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/multi.c | 3 | ||||
| -rw-r--r-- | lib/strerror.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/multi.c b/lib/multi.c index aa8eaf06b..93be7700a 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -357,8 +357,7 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle, /* Prevent users from adding same easy handle more than once and prevent adding to more than one multi stack */ if(data->multi) - /* possibly we should create a new unique error code for this condition */ - return CURLM_BAD_EASY_HANDLE; + return CURLM_ADDED_ALREADY; /* Allocate and initialize timeout list for easy handle */ timeoutlist = Curl_llist_alloc(multi_freetimeout); diff --git a/lib/strerror.c b/lib/strerror.c index a385f5572..9e8c83f72 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2004 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2004 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -361,6 +361,9 @@ curl_multi_strerror(CURLMcode error) case CURLM_UNKNOWN_OPTION: return "Unknown option"; + case CURLM_ADDED_ALREADY: + return "The easy handle is already added to a multi handle"; + case CURLM_LAST: break; } |