diff options
| author | Yang Tse <yangsita@gmail.com> | 2006-10-27 15:32:18 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2006-10-27 15:32:18 +0000 |
| commit | a93695a70ea273417ad6c52323d7a7d2c47b8a2b (patch) | |
| tree | 56c79cd1dbf63795de4b5b77ccbe8bef84dfec99 /lib | |
| parent | ce935a26971ea6d6fd2726c27b5f83353eaf2a7e (diff) | |
Compiler warning fix.
Assigning the const value zero to a pointer to function
results in a null pointer value assignment to the function
pointer.
Assignment of any nonzero value is what should result in a
implementation compiler dependent result.
Since what we want to do here is the first case, this should
not trigger compiler warnings related with conversions from
'pointer to data' to 'pointer to function'.
Our autobuild test suite will judge.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ldap.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/ldap.c b/lib/ldap.c index 1c062dc44..6a5e0d6dd 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -189,7 +189,7 @@ static void DynaClose(void) static dynafunc DynaGetFunction(const char *name) { - dynafunc func = (void *(*)(void *))NULL; + dynafunc func = (void *(*)(void *))0; #if defined(HAVE_DLOPEN) || defined(HAVE_LIBDL) if (libldap) { @@ -501,9 +501,9 @@ CURLcode Curl_open(struct SessionHandle **curl) data->set.fread = (curl_read_callback)fread; /* conversion callbacks for non-ASCII hosts */ - data->set.convfromnetwork = (CURLcode(*)(char *, size_t))NULL; - data->set.convtonetwork = (CURLcode(*)(char *, size_t))NULL; - data->set.convfromutf8 = (CURLcode(*)(char *, size_t))NULL; + data->set.convfromnetwork = (CURLcode(*)(char *, size_t))0; + data->set.convtonetwork = (CURLcode(*)(char *, size_t))0; + data->set.convfromutf8 = (CURLcode(*)(char *, size_t))0; #if defined(CURL_DOES_CONVERSIONS) && defined(HAVE_ICONV) /* conversion descriptors for iconv calls */ @@ -2993,7 +2993,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, conn->remote_port = PORT_HTTP; conn->protocol |= PROT_HTTP; conn->curl_do = Curl_http; - conn->curl_do_more = (CURLcode(*)(struct connectdata *)) NULL; + conn->curl_do_more = (CURLcode(*)(struct connectdata *))0; conn->curl_done = Curl_http_done; conn->curl_connect = Curl_http_connect; #else @@ -3010,7 +3010,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, conn->protocol |= PROT_HTTP|PROT_HTTPS|PROT_SSL; conn->curl_do = Curl_http; - conn->curl_do_more = (CURLcode(*)(struct connectdata *))NULL; + conn->curl_do_more = (CURLcode(*)(struct connectdata *))0; conn->curl_done = Curl_http_done; conn->curl_connect = Curl_http_connect; conn->curl_connecting = Curl_https_connecting; @@ -3124,7 +3124,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, conn->remote_port = PORT_DICT; conn->curl_do = Curl_dict; /* no DICT-specific done */ - conn->curl_done = (CURLcode(*)(struct connectdata *, CURLcode))NULL; + conn->curl_done = (CURLcode(*)(struct connectdata *, CURLcode))0; #else failf(data, LIBCURL_NAME " was built with DICT disabled!"); @@ -3137,7 +3137,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, conn->remote_port = PORT_LDAP; conn->curl_do = Curl_ldap; /* no LDAP-specific done */ - conn->curl_done = (CURLcode(*)(struct connectdata *, CURLcode))NULL; + conn->curl_done = (CURLcode(*)(struct connectdata *, CURLcode))0; #else failf(data, LIBCURL_NAME " was built with LDAP disabled!"); |