mirror of
https://github.com/curl/curl.git
synced 2026-08-25 22:13:33 +03:00
tidy-up: miscellaneous
- drop stray duplicate empty lines in docs, scripts, test data, include, examples, tests. - drop duplicate PP parenthesis. - curl-functions.m4: move literals to the right side in if expressions, to match rest of the source code. - FAQ.md: delete language designator from an URL. - packages: apply clang-format (OS400, VMS). - scripts/schemetable.c: apply clang-format. - data320: delete duplicate empty line that doesn't change the outcome. - spacecheck: extend to check for duplicate empty lines (with exceptions.) - fix whitespace nits Closes #19936
This commit is contained in:
Viktor Szakats
parent
141ce4be64
commit
fe8393d7db
116 changed files with 674 additions and 1039 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -28,7 +28,6 @@
|
|||
#include "easy.h"
|
||||
#include "multi.h"
|
||||
|
||||
|
||||
CURL_EXTERN char *curl_version_ccsid(unsigned int ccsid);
|
||||
CURL_EXTERN char *curl_easy_escape_ccsid(CURL *handle,
|
||||
const char *string, int length,
|
||||
|
|
|
|||
|
|
@ -48,16 +48,13 @@ struct arguments {
|
|||
struct vary2 *cmdargs; /* Command line arguments. */
|
||||
};
|
||||
|
||||
static int
|
||||
is_ifs(char c)
|
||||
static int is_ifs(char c)
|
||||
{
|
||||
return c == ' ' || c == '\t' || c == '\r' || c == '\n';
|
||||
}
|
||||
|
||||
static int
|
||||
parse_command_line(const char *cmdargs, size_t len,
|
||||
size_t *argc, char **argv,
|
||||
size_t *argsize, char *argbuf)
|
||||
static int parse_command_line(const char *cmdargs, size_t len, size_t *argc,
|
||||
char **argv, size_t *argsize, char *argbuf)
|
||||
{
|
||||
const char *endline = cmdargs + len;
|
||||
char quote = '\0';
|
||||
|
|
@ -126,9 +123,7 @@ parse_command_line(const char *cmdargs, size_t len,
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main(int argsc, struct arguments *args)
|
||||
int main(int argsc, struct arguments *args)
|
||||
{
|
||||
size_t argc;
|
||||
char **argv;
|
||||
|
|
@ -154,20 +149,20 @@ main(int argsc, struct arguments *args)
|
|||
|
||||
if(!exitcode) {
|
||||
/* Allocate space for parsed arguments. */
|
||||
argv = (char **) malloc((argc + 1) * sizeof(*argv) + argsize);
|
||||
argv = (char **)malloc((argc + 1) * sizeof(*argv) + argsize);
|
||||
if(!argv) {
|
||||
fputs("Memory allocation error\n", stderr);
|
||||
exitcode = -2;
|
||||
}
|
||||
else {
|
||||
_SYSPTR pgmptr = rslvsp(WLI_PGM, (char *) CURLPGM, library, _AUTH_NONE);
|
||||
_LU_Work_Area_T *luwrka = (_LU_Work_Area_T *) _LUWRKA();
|
||||
_SYSPTR pgmptr = rslvsp(WLI_PGM, (char *)CURLPGM, library, _AUTH_NONE);
|
||||
_LU_Work_Area_T *luwrka = (_LU_Work_Area_T *)_LUWRKA();
|
||||
|
||||
parse_command_line(args->cmdargs->string, args->cmdargs->len,
|
||||
&argc, argv, &argsize, (char *) (argv + argc + 1));
|
||||
parse_command_line(args->cmdargs->string, args->cmdargs->len, &argc,
|
||||
argv, &argsize, (char *)(argv + argc + 1));
|
||||
|
||||
/* Call program. */
|
||||
_CALLPGMV((void *) &pgmptr, argv, argc);
|
||||
_CALLPGMV((void *)&pgmptr, argv, argc);
|
||||
exitcode = luwrka->LU_RC;
|
||||
|
||||
free(argv);
|
||||
|
|
|
|||
|
|
@ -41,15 +41,13 @@ extern int QadrtFreeConversionTable(void);
|
|||
extern int QadrtFreeEnviron(void);
|
||||
extern char * setlocale_a(int, const char *);
|
||||
|
||||
|
||||
/* The ASCII main program. */
|
||||
extern int main_a(int argc, char * * argv);
|
||||
extern int main_a(int argc, char **argv);
|
||||
|
||||
/* Global values of original EBCDIC arguments. */
|
||||
int ebcdic_argc;
|
||||
char ** ebcdic_argv;
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -63,8 +61,8 @@ int main(int argc, char **argv)
|
|||
char dummybuf[128];
|
||||
/* To/From codes are 32 byte long strings with
|
||||
reserved fields initialized to ZEROs */
|
||||
const char tocode[32] = {"IBMCCSID01208"}; /* Use UTF-8. */
|
||||
const char fromcode[32] = {"IBMCCSID000000000010"};
|
||||
const char tocode[32] = { "IBMCCSID01208" }; /* Use UTF-8. */
|
||||
const char fromcode[32] = { "IBMCCSID000000000010" };
|
||||
|
||||
ebcdic_argc = argc;
|
||||
ebcdic_argv = argv;
|
||||
|
|
@ -88,10 +86,10 @@ int main(int argc, char **argv)
|
|||
}
|
||||
|
||||
/* Allocate memory for the ASCII arguments and vector. */
|
||||
argv = (char **) malloc((argc + 1) * sizeof(*argv) + bytecount);
|
||||
argv = (char **)malloc((argc + 1) * sizeof(*argv) + bytecount);
|
||||
|
||||
/* Build the vector and convert argument encoding. */
|
||||
outbuf = (char *) (argv + argc + 1);
|
||||
outbuf = (char *)(argv + argc + 1);
|
||||
outbytesleft = bytecount;
|
||||
|
||||
for(i = 0; i < argc; i++) {
|
||||
|
|
@ -112,7 +110,7 @@ int main(int argc, char **argv)
|
|||
i = main_a(argc, argv);
|
||||
|
||||
/* Clean-up allocated items. */
|
||||
free((char *) argv);
|
||||
free((char *)argv);
|
||||
QadrtFreeConversionTable();
|
||||
QadrtFreeEnviron();
|
||||
|
||||
|
|
|
|||
|
|
@ -65,14 +65,13 @@
|
|||
|
||||
#pragma convert(0) /* Restore EBCDIC. */
|
||||
|
||||
#define MIN_BYTE_GAIN 1024 /* Minimum gain when shortening a buffer. */
|
||||
#define MIN_BYTE_GAIN 1024 /* Minimum gain when shortening a buffer. */
|
||||
|
||||
struct buffer_t {
|
||||
unsigned long size; /* Buffer size. */
|
||||
char *buf; /* Buffer address. */
|
||||
};
|
||||
|
||||
|
||||
static char *buffer_undef(localkey_t key, long size);
|
||||
static char *buffer_threaded(localkey_t key, long size);
|
||||
static char *buffer_unthreaded(localkey_t key, long size);
|
||||
|
|
@ -86,10 +85,10 @@ char *(*Curl_thread_buffer)(localkey_t key, long size) = buffer_undef;
|
|||
static void thdbufdestroy(void *private)
|
||||
{
|
||||
if(private) {
|
||||
struct buffer_t *p = (struct buffer_t *) private;
|
||||
struct buffer_t *p = (struct buffer_t *)private;
|
||||
localkey_t i;
|
||||
|
||||
for(i = (localkey_t) 0; i < LK_LAST; i++) {
|
||||
for(i = (localkey_t)0; i < LK_LAST; i++) {
|
||||
free(p->buf);
|
||||
p++;
|
||||
}
|
||||
|
|
@ -98,27 +97,23 @@ static void thdbufdestroy(void *private)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
terminate(void)
|
||||
static void terminate(void)
|
||||
{
|
||||
if(Curl_thread_buffer == buffer_threaded) {
|
||||
locbufs = pthread_getspecific(thdkey);
|
||||
pthread_setspecific(thdkey, (void *) NULL);
|
||||
pthread_setspecific(thdkey, (void *)NULL);
|
||||
pthread_key_delete(thdkey);
|
||||
}
|
||||
|
||||
if(Curl_thread_buffer != buffer_undef) {
|
||||
thdbufdestroy((void *) locbufs);
|
||||
locbufs = (struct buffer_t *) NULL;
|
||||
thdbufdestroy((void *)locbufs);
|
||||
locbufs = (struct buffer_t *)NULL;
|
||||
}
|
||||
|
||||
Curl_thread_buffer = buffer_undef;
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
get_buffer(struct buffer_t *buf, long size)
|
||||
static char *get_buffer(struct buffer_t *buf, long size)
|
||||
{
|
||||
char *cp;
|
||||
|
||||
|
|
@ -136,7 +131,7 @@ get_buffer(struct buffer_t *buf, long size)
|
|||
return buf->buf;
|
||||
}
|
||||
|
||||
if((unsigned long) size <= buf->size) {
|
||||
if((unsigned long)size <= buf->size) {
|
||||
/* Shorten the buffer only if it frees a significant byte count. This
|
||||
avoids some realloc() overhead. */
|
||||
|
||||
|
|
@ -157,27 +152,23 @@ get_buffer(struct buffer_t *buf, long size)
|
|||
return cp;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Get buffer address for the given local key.
|
||||
* This is always called though `Curl_thread_buffer' and when threads are
|
||||
* NOT made available by the os, so no mutex lock/unlock occurs.
|
||||
*/
|
||||
static char *
|
||||
buffer_unthreaded(localkey_t key, long size)
|
||||
static char *buffer_unthreaded(localkey_t key, long size)
|
||||
{
|
||||
return get_buffer(locbufs + key, size);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Get buffer address for the given local key, taking care of
|
||||
* concurrent threads.
|
||||
* This is always called though `Curl_thread_buffer' and when threads are
|
||||
* made available by the os.
|
||||
*/
|
||||
static char *
|
||||
buffer_threaded(localkey_t key, long size)
|
||||
static char *buffer_threaded(localkey_t key, long size)
|
||||
{
|
||||
struct buffer_t *bufs;
|
||||
|
||||
|
|
@ -185,30 +176,28 @@ buffer_threaded(localkey_t key, long size)
|
|||
make sure it is at least `size'-byte long. Set `size' to < 0 to get
|
||||
its address only. */
|
||||
|
||||
bufs = (struct buffer_t *) pthread_getspecific(thdkey);
|
||||
bufs = (struct buffer_t *)pthread_getspecific(thdkey);
|
||||
|
||||
if(!bufs) {
|
||||
if(size < 0)
|
||||
return (char *) NULL; /* No buffer yet. */
|
||||
return (char *)NULL; /* No buffer yet. */
|
||||
|
||||
/* Allocate buffer descriptors for the current thread. */
|
||||
|
||||
bufs = calloc((size_t) LK_LAST, sizeof(*bufs));
|
||||
bufs = calloc((size_t)LK_LAST, sizeof(*bufs));
|
||||
if(!bufs)
|
||||
return (char *) NULL;
|
||||
return (char *)NULL;
|
||||
|
||||
if(pthread_setspecific(thdkey, (void *) bufs)) {
|
||||
if(pthread_setspecific(thdkey, (void *)bufs)) {
|
||||
free(bufs);
|
||||
return (char *) NULL;
|
||||
return (char *)NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return get_buffer(bufs + key, size);
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
buffer_undef(localkey_t key, long size)
|
||||
static char *buffer_undef(localkey_t key, long size)
|
||||
{
|
||||
/* Define the buffer system, get the buffer for the given local key in
|
||||
the current thread, and make sure it is at least `size'-byte long.
|
||||
|
|
@ -218,7 +207,7 @@ buffer_undef(localkey_t key, long size)
|
|||
|
||||
/* Determine if we can use pthread-specific data. */
|
||||
|
||||
if(Curl_thread_buffer == buffer_undef) { /* If unchanged during lock. */
|
||||
if(Curl_thread_buffer == buffer_undef) { /* If unchanged during lock. */
|
||||
/* OS400 interactive jobs do not support threads: check here. */
|
||||
if(!pthread_key_create(&thdkey, thdbufdestroy)) {
|
||||
/* Threads are supported: use the thread-aware buffer procedure. */
|
||||
|
|
@ -227,10 +216,10 @@ buffer_undef(localkey_t key, long size)
|
|||
else {
|
||||
/* No multi-threading available: allocate storage for single-thread
|
||||
* buffer headers. */
|
||||
locbufs = calloc((size_t) LK_LAST, sizeof(*locbufs));
|
||||
locbufs = calloc((size_t)LK_LAST, sizeof(*locbufs));
|
||||
if(!locbufs) {
|
||||
pthread_mutex_unlock(&mutex); /* For symetry: will probably fail. */
|
||||
return (char *) NULL;
|
||||
pthread_mutex_unlock(&mutex); /* For symetry: will probably fail. */
|
||||
return (char *)NULL;
|
||||
}
|
||||
else
|
||||
Curl_thread_buffer = buffer_unthreaded; /* Use unthreaded version. */
|
||||
|
|
@ -243,15 +232,13 @@ buffer_undef(localkey_t key, long size)
|
|||
return Curl_thread_buffer(key, size);
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
set_thread_string(localkey_t key, const char *s)
|
||||
static char *set_thread_string(localkey_t key, const char *s)
|
||||
{
|
||||
int i;
|
||||
char *cp;
|
||||
|
||||
if(!s)
|
||||
return (char *) NULL;
|
||||
return (char *)NULL;
|
||||
|
||||
i = strlen(s) + 1;
|
||||
cp = Curl_thread_buffer(key, MAX_CONV_EXPANSION * i + 1);
|
||||
|
|
@ -264,12 +251,10 @@ set_thread_string(localkey_t key, const char *s)
|
|||
return cp;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
Curl_getnameinfo_a(const struct sockaddr *sa, socklen_t salen,
|
||||
char *nodename, socklen_t nodenamelen,
|
||||
char *servname, socklen_t servnamelen,
|
||||
int flags)
|
||||
int Curl_getnameinfo_a(const struct sockaddr *sa, socklen_t salen,
|
||||
char *nodename, socklen_t nodenamelen,
|
||||
char *servname, socklen_t servnamelen,
|
||||
int flags)
|
||||
{
|
||||
char *enodename = NULL;
|
||||
char *eservname = NULL;
|
||||
|
|
@ -289,20 +274,20 @@ Curl_getnameinfo_a(const struct sockaddr *sa, socklen_t salen,
|
|||
}
|
||||
}
|
||||
|
||||
status = getnameinfo(sa, salen, enodename, nodenamelen,
|
||||
eservname, servnamelen, flags);
|
||||
status = getnameinfo(sa, salen, enodename, nodenamelen, eservname,
|
||||
servnamelen, flags);
|
||||
|
||||
if(!status) {
|
||||
int i;
|
||||
if(enodename) {
|
||||
i = QadrtConvertE2A(nodename, enodename,
|
||||
nodenamelen - 1, strlen(enodename));
|
||||
i = QadrtConvertE2A(nodename, enodename, nodenamelen - 1,
|
||||
strlen(enodename));
|
||||
nodename[i] = '\0';
|
||||
}
|
||||
|
||||
if(eservname) {
|
||||
i = QadrtConvertE2A(servname, eservname,
|
||||
servnamelen - 1, strlen(eservname));
|
||||
i = QadrtConvertE2A(servname, eservname, servnamelen - 1,
|
||||
strlen(eservname));
|
||||
servname[i] = '\0';
|
||||
}
|
||||
}
|
||||
|
|
@ -312,18 +297,16 @@ Curl_getnameinfo_a(const struct sockaddr *sa, socklen_t salen,
|
|||
return status;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_getaddrinfo_a(const char *nodename, const char *servname,
|
||||
const struct addrinfo *hints,
|
||||
struct addrinfo **res)
|
||||
int Curl_getaddrinfo_a(const char *nodename, const char *servname,
|
||||
const struct addrinfo *hints, struct addrinfo **res)
|
||||
{
|
||||
char *enodename;
|
||||
char *eservname;
|
||||
int status;
|
||||
int i;
|
||||
|
||||
enodename = (char *) NULL;
|
||||
eservname = (char *) NULL;
|
||||
enodename = (char *)NULL;
|
||||
eservname = (char *)NULL;
|
||||
|
||||
if(nodename) {
|
||||
i = strlen(nodename);
|
||||
|
|
@ -360,8 +343,7 @@ Curl_getaddrinfo_a(const char *nodename, const char *servname,
|
|||
|
||||
/* ASCII wrappers for the GSSAPI procedures. */
|
||||
|
||||
static int
|
||||
Curl_gss_convert_in_place(OM_uint32 *minor_status, gss_buffer_t buf)
|
||||
static int Curl_gss_convert_in_place(OM_uint32 *minor_status, gss_buffer_t buf)
|
||||
{
|
||||
unsigned int i = buf->length;
|
||||
|
||||
|
|
@ -388,10 +370,8 @@ Curl_gss_convert_in_place(OM_uint32 *minor_status, gss_buffer_t buf)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
OM_uint32
|
||||
Curl_gss_import_name_a(OM_uint32 *minor_status, gss_buffer_t in_name,
|
||||
gss_OID in_name_type, gss_name_t *out_name)
|
||||
OM_uint32 Curl_gss_import_name_a(OM_uint32 *minor_status, gss_buffer_t in_name,
|
||||
gss_OID in_name_type, gss_name_t *out_name)
|
||||
{
|
||||
OM_uint32 rc;
|
||||
unsigned int i;
|
||||
|
|
@ -400,7 +380,7 @@ Curl_gss_import_name_a(OM_uint32 *minor_status, gss_buffer_t in_name,
|
|||
if(!in_name || !in_name->value || !in_name->length)
|
||||
return gss_import_name(minor_status, in_name, in_name_type, out_name);
|
||||
|
||||
memcpy((char *) &in, (char *) in_name, sizeof(in));
|
||||
memcpy((char *)&in, (char *)in_name, sizeof(in));
|
||||
i = in.length;
|
||||
|
||||
in.value = malloc(i + 1);
|
||||
|
|
@ -413,17 +393,17 @@ Curl_gss_import_name_a(OM_uint32 *minor_status, gss_buffer_t in_name,
|
|||
}
|
||||
|
||||
QadrtConvertA2E(in.value, in_name->value, i, i);
|
||||
((char *) in.value)[i] = '\0';
|
||||
((char *)in.value)[i] = '\0';
|
||||
rc = gss_import_name(minor_status, &in, in_name_type, out_name);
|
||||
free(in.value);
|
||||
return rc;
|
||||
}
|
||||
|
||||
OM_uint32
|
||||
Curl_gss_display_status_a(OM_uint32 *minor_status, OM_uint32 status_value,
|
||||
int status_type, gss_OID mech_type,
|
||||
gss_msg_ctx_t *message_context,
|
||||
gss_buffer_t status_string)
|
||||
OM_uint32 Curl_gss_display_status_a(OM_uint32 *minor_status,
|
||||
OM_uint32 status_value, int status_type,
|
||||
gss_OID mech_type,
|
||||
gss_msg_ctx_t *message_context,
|
||||
gss_buffer_t status_string)
|
||||
{
|
||||
int rc;
|
||||
|
||||
|
|
@ -477,7 +457,7 @@ Curl_gss_init_sec_context_a(OM_uint32 *minor_status,
|
|||
}
|
||||
|
||||
QadrtConvertA2E(in.value, input_token->value, i, i);
|
||||
((char *) in.value)[i] = '\0';
|
||||
((char *)in.value)[i] = '\0';
|
||||
in.length = i;
|
||||
inp = ∈
|
||||
}
|
||||
|
|
@ -503,11 +483,9 @@ Curl_gss_init_sec_context_a(OM_uint32 *minor_status,
|
|||
return rc;
|
||||
}
|
||||
|
||||
|
||||
OM_uint32
|
||||
Curl_gss_delete_sec_context_a(OM_uint32 *minor_status,
|
||||
gss_ctx_id_t *context_handle,
|
||||
gss_buffer_t output_token)
|
||||
OM_uint32 Curl_gss_delete_sec_context_a(OM_uint32 *minor_status,
|
||||
gss_ctx_id_t *context_handle,
|
||||
gss_buffer_t output_token)
|
||||
{
|
||||
OM_uint32 rc;
|
||||
|
||||
|
|
@ -533,38 +511,36 @@ Curl_gss_delete_sec_context_a(OM_uint32 *minor_status,
|
|||
|
||||
/* ASCII wrappers for the LDAP procedures. */
|
||||
|
||||
void *
|
||||
Curl_ldap_init_a(char *host, int port)
|
||||
void *Curl_ldap_init_a(char *host, int port)
|
||||
{
|
||||
size_t i;
|
||||
char *ehost;
|
||||
void *result;
|
||||
|
||||
if(!host)
|
||||
return (void *) ldap_init(host, port);
|
||||
return (void *)ldap_init(host, port);
|
||||
|
||||
i = strlen(host);
|
||||
|
||||
ehost = malloc(i + 1);
|
||||
if(!ehost)
|
||||
return (void *) NULL;
|
||||
return (void *)NULL;
|
||||
|
||||
QadrtConvertA2E(ehost, host, i, i);
|
||||
ehost[i] = '\0';
|
||||
result = (void *) ldap_init(ehost, port);
|
||||
result = (void *)ldap_init(ehost, port);
|
||||
free(ehost);
|
||||
return result;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_ldap_simple_bind_s_a(void *ld, char *dn, char *passwd)
|
||||
int Curl_ldap_simple_bind_s_a(void *ld, char *dn, char *passwd)
|
||||
{
|
||||
int i;
|
||||
char *edn;
|
||||
char *epasswd;
|
||||
|
||||
edn = (char *) NULL;
|
||||
epasswd = (char *) NULL;
|
||||
edn = (char *)NULL;
|
||||
epasswd = (char *)NULL;
|
||||
|
||||
if(dn) {
|
||||
i = strlen(dn);
|
||||
|
|
@ -596,9 +572,8 @@ Curl_ldap_simple_bind_s_a(void *ld, char *dn, char *passwd)
|
|||
return i;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_ldap_search_s_a(void *ld, char *base, int scope, char *filter,
|
||||
char **attrs, int attrsonly, LDAPMessage **res)
|
||||
int Curl_ldap_search_s_a(void *ld, char *base, int scope, char *filter,
|
||||
char **attrs, int attrsonly, LDAPMessage **res)
|
||||
{
|
||||
int i;
|
||||
int j;
|
||||
|
|
@ -607,9 +582,9 @@ Curl_ldap_search_s_a(void *ld, char *base, int scope, char *filter,
|
|||
char **eattrs;
|
||||
int status;
|
||||
|
||||
ebase = (char *) NULL;
|
||||
efilter = (char *) NULL;
|
||||
eattrs = (char **) NULL;
|
||||
ebase = (char *)NULL;
|
||||
efilter = (char *)NULL;
|
||||
eattrs = (char **)NULL;
|
||||
status = LDAP_SUCCESS;
|
||||
|
||||
if(base) {
|
||||
|
|
@ -676,14 +651,13 @@ Curl_ldap_search_s_a(void *ld, char *base, int scope, char *filter,
|
|||
return status;
|
||||
}
|
||||
|
||||
|
||||
struct berval **
|
||||
Curl_ldap_get_values_len_a(void *ld, LDAPMessage *entry, const char *attr)
|
||||
struct berval **Curl_ldap_get_values_len_a(void *ld, LDAPMessage *entry,
|
||||
const char *attr)
|
||||
{
|
||||
char *cp;
|
||||
struct berval **result;
|
||||
|
||||
cp = (char *) NULL;
|
||||
cp = (char *)NULL;
|
||||
|
||||
if(attr) {
|
||||
int i = strlen(attr);
|
||||
|
|
@ -692,7 +666,7 @@ Curl_ldap_get_values_len_a(void *ld, LDAPMessage *entry, const char *attr)
|
|||
if(!cp) {
|
||||
ldap_set_lderrno(ld, LDAP_NO_MEMORY, NULL,
|
||||
ldap_err2string(LDAP_NO_MEMORY));
|
||||
return (struct berval **) NULL;
|
||||
return (struct berval **)NULL;
|
||||
}
|
||||
|
||||
QadrtConvertA2E(cp, attr, i, i);
|
||||
|
|
@ -708,14 +682,12 @@ Curl_ldap_get_values_len_a(void *ld, LDAPMessage *entry, const char *attr)
|
|||
return result;
|
||||
}
|
||||
|
||||
char *
|
||||
Curl_ldap_err2string_a(int error)
|
||||
char *Curl_ldap_err2string_a(int error)
|
||||
{
|
||||
return set_thread_string(LK_LDAP_ERROR, ldap_err2string(error));
|
||||
}
|
||||
|
||||
char *
|
||||
Curl_ldap_get_dn_a(void *ld, LDAPMessage *entry)
|
||||
char *Curl_ldap_get_dn_a(void *ld, LDAPMessage *entry)
|
||||
{
|
||||
int i;
|
||||
char *cp;
|
||||
|
|
@ -744,9 +716,8 @@ Curl_ldap_get_dn_a(void *ld, LDAPMessage *entry)
|
|||
return cp;
|
||||
}
|
||||
|
||||
char *
|
||||
Curl_ldap_first_attribute_a(void *ld,
|
||||
LDAPMessage *entry, BerElement **berptr)
|
||||
char *Curl_ldap_first_attribute_a(void *ld, LDAPMessage *entry,
|
||||
BerElement **berptr)
|
||||
{
|
||||
int i;
|
||||
char *cp;
|
||||
|
|
@ -775,9 +746,8 @@ Curl_ldap_first_attribute_a(void *ld,
|
|||
return cp;
|
||||
}
|
||||
|
||||
char *
|
||||
Curl_ldap_next_attribute_a(void *ld,
|
||||
LDAPMessage *entry, BerElement *berptr)
|
||||
char *Curl_ldap_next_attribute_a(void *ld, LDAPMessage *entry,
|
||||
BerElement *berptr)
|
||||
{
|
||||
int i;
|
||||
char *cp;
|
||||
|
|
@ -808,9 +778,8 @@ Curl_ldap_next_attribute_a(void *ld,
|
|||
|
||||
#endif /* CURL_DISABLE_LDAP */
|
||||
|
||||
static int
|
||||
sockaddr2ebcdic(struct sockaddr_storage *dstaddr,
|
||||
const struct sockaddr *srcaddr, int srclen)
|
||||
static int sockaddr2ebcdic(struct sockaddr_storage *dstaddr,
|
||||
const struct sockaddr *srcaddr, int srclen)
|
||||
{
|
||||
const struct sockaddr_un *srcu;
|
||||
struct sockaddr_un *dstu;
|
||||
|
|
@ -826,13 +795,13 @@ sockaddr2ebcdic(struct sockaddr_storage *dstaddr,
|
|||
return -1;
|
||||
}
|
||||
|
||||
memcpy((char *) dstaddr, (char *) srcaddr, srclen);
|
||||
memcpy((char *)dstaddr, (char *)srcaddr, srclen);
|
||||
|
||||
switch(srcaddr->sa_family) {
|
||||
|
||||
case AF_UNIX:
|
||||
srcu = (const struct sockaddr_un *) srcaddr;
|
||||
dstu = (struct sockaddr_un *) dstaddr;
|
||||
srcu = (const struct sockaddr_un *)srcaddr;
|
||||
dstu = (struct sockaddr_un *)dstaddr;
|
||||
dstsize = sizeof(*dstaddr) - offsetof(struct sockaddr_un, sun_path);
|
||||
srclen -= offsetof(struct sockaddr_un, sun_path);
|
||||
i = QadrtConvertA2E(dstu->sun_path, srcu->sun_path, dstsize - 1, srclen);
|
||||
|
|
@ -843,10 +812,8 @@ sockaddr2ebcdic(struct sockaddr_storage *dstaddr,
|
|||
return srclen;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
sockaddr2ascii(struct sockaddr *dstaddr, int dstlen,
|
||||
const struct sockaddr_storage *srcaddr, int srclen)
|
||||
static int sockaddr2ascii(struct sockaddr *dstaddr, int dstlen,
|
||||
const struct sockaddr_storage *srcaddr, int srclen)
|
||||
{
|
||||
const struct sockaddr_un *srcu;
|
||||
struct sockaddr_un *dstu;
|
||||
|
|
@ -864,15 +831,15 @@ sockaddr2ascii(struct sockaddr *dstaddr, int dstlen,
|
|||
return -1;
|
||||
}
|
||||
|
||||
memcpy((char *) dstaddr, (char *) srcaddr, srclen);
|
||||
memcpy((char *)dstaddr, (char *)srcaddr, srclen);
|
||||
|
||||
if(srclen >= offsetof(struct sockaddr_storage, ss_family) +
|
||||
sizeof(srcaddr->ss_family)) {
|
||||
switch(srcaddr->ss_family) {
|
||||
|
||||
case AF_UNIX:
|
||||
srcu = (const struct sockaddr_un *) srcaddr;
|
||||
dstu = (struct sockaddr_un *) dstaddr;
|
||||
srcu = (const struct sockaddr_un *)srcaddr;
|
||||
dstu = (struct sockaddr_un *)dstaddr;
|
||||
dstsize = dstlen - offsetof(struct sockaddr_un, sun_path);
|
||||
srclen -= offsetof(struct sockaddr_un, sun_path);
|
||||
if(dstsize > 0 && srclen > 0) {
|
||||
|
|
@ -887,8 +854,7 @@ sockaddr2ascii(struct sockaddr *dstaddr, int dstlen,
|
|||
return srclen;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_connect(int sd, struct sockaddr *destaddr, int addrlen)
|
||||
int Curl_os400_connect(int sd, struct sockaddr *destaddr, int addrlen)
|
||||
{
|
||||
int i;
|
||||
struct sockaddr_storage laddr;
|
||||
|
|
@ -898,11 +864,10 @@ Curl_os400_connect(int sd, struct sockaddr *destaddr, int addrlen)
|
|||
if(i < 0)
|
||||
return -1;
|
||||
|
||||
return connect(sd, (struct sockaddr *) &laddr, i);
|
||||
return connect(sd, (struct sockaddr *)&laddr, i);
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_bind(int sd, struct sockaddr *localaddr, int addrlen)
|
||||
int Curl_os400_bind(int sd, struct sockaddr *localaddr, int addrlen)
|
||||
{
|
||||
int i;
|
||||
struct sockaddr_storage laddr;
|
||||
|
|
@ -912,12 +877,11 @@ Curl_os400_bind(int sd, struct sockaddr *localaddr, int addrlen)
|
|||
if(i < 0)
|
||||
return -1;
|
||||
|
||||
return bind(sd, (struct sockaddr *) &laddr, i);
|
||||
return bind(sd, (struct sockaddr *)&laddr, i);
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_sendto(int sd, char *buffer, int buflen, int flags,
|
||||
const struct sockaddr *dstaddr, int addrlen)
|
||||
int Curl_os400_sendto(int sd, char *buffer, int buflen, int flags,
|
||||
const struct sockaddr *dstaddr, int addrlen)
|
||||
{
|
||||
int i;
|
||||
struct sockaddr_storage laddr;
|
||||
|
|
@ -927,12 +891,11 @@ Curl_os400_sendto(int sd, char *buffer, int buflen, int flags,
|
|||
if(i < 0)
|
||||
return -1;
|
||||
|
||||
return sendto(sd, buffer, buflen, flags, (struct sockaddr *) &laddr, i);
|
||||
return sendto(sd, buffer, buflen, flags, (struct sockaddr *)&laddr, i);
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_recvfrom(int sd, char *buffer, int buflen, int flags,
|
||||
struct sockaddr *fromaddr, int *addrlen)
|
||||
int Curl_os400_recvfrom(int sd, char *buffer, int buflen, int flags,
|
||||
struct sockaddr *fromaddr, int *addrlen)
|
||||
{
|
||||
int rcvlen;
|
||||
struct sockaddr_storage laddr;
|
||||
|
|
@ -943,7 +906,7 @@ Curl_os400_recvfrom(int sd, char *buffer, int buflen, int flags,
|
|||
|
||||
laddr.ss_family = AF_UNSPEC; /* To detect if unused. */
|
||||
rcvlen = recvfrom(sd, buffer, buflen, flags,
|
||||
(struct sockaddr *) &laddr, &laddrlen);
|
||||
(struct sockaddr *)&laddr, &laddrlen);
|
||||
|
||||
if(rcvlen < 0)
|
||||
return rcvlen;
|
||||
|
|
@ -959,12 +922,11 @@ Curl_os400_recvfrom(int sd, char *buffer, int buflen, int flags,
|
|||
return rcvlen;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_getpeername(int sd, struct sockaddr *addr, int *addrlen)
|
||||
int Curl_os400_getpeername(int sd, struct sockaddr *addr, int *addrlen)
|
||||
{
|
||||
struct sockaddr_storage laddr;
|
||||
int laddrlen = sizeof(laddr);
|
||||
int retcode = getpeername(sd, (struct sockaddr *) &laddr, &laddrlen);
|
||||
int retcode = getpeername(sd, (struct sockaddr *)&laddr, &laddrlen);
|
||||
|
||||
if(!retcode) {
|
||||
laddrlen = sockaddr2ascii(addr, *addrlen, &laddr, laddrlen);
|
||||
|
|
@ -976,12 +938,11 @@ Curl_os400_getpeername(int sd, struct sockaddr *addr, int *addrlen)
|
|||
return retcode;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_getsockname(int sd, struct sockaddr *addr, int *addrlen)
|
||||
int Curl_os400_getsockname(int sd, struct sockaddr *addr, int *addrlen)
|
||||
{
|
||||
struct sockaddr_storage laddr;
|
||||
int laddrlen = sizeof(laddr);
|
||||
int retcode = getsockname(sd, (struct sockaddr *) &laddr, &laddrlen);
|
||||
int retcode = getsockname(sd, (struct sockaddr *)&laddr, &laddrlen);
|
||||
|
||||
if(!retcode) {
|
||||
laddrlen = sockaddr2ascii(addr, *addrlen, &laddr, laddrlen);
|
||||
|
|
@ -993,17 +954,14 @@ Curl_os400_getsockname(int sd, struct sockaddr *addr, int *addrlen)
|
|||
return retcode;
|
||||
}
|
||||
|
||||
|
||||
#ifdef HAVE_LIBZ
|
||||
const char *
|
||||
Curl_os400_zlibVersion(void)
|
||||
const char *Curl_os400_zlibVersion(void)
|
||||
{
|
||||
return set_thread_string(LK_ZLIB_VERSION, zlibVersion());
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
Curl_os400_inflateInit_(z_streamp strm, const char *version, int stream_size)
|
||||
int Curl_os400_inflateInit_(z_streamp strm, const char *version,
|
||||
int stream_size)
|
||||
{
|
||||
z_const char *msgb4 = strm->msg;
|
||||
int ret;
|
||||
|
|
@ -1016,9 +974,8 @@ Curl_os400_inflateInit_(z_streamp strm, const char *version, int stream_size)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_inflateInit2_(z_streamp strm, int windowBits,
|
||||
const char *version, int stream_size)
|
||||
int Curl_os400_inflateInit2_(z_streamp strm, int windowBits,
|
||||
const char *version, int stream_size)
|
||||
{
|
||||
z_const char *msgb4 = strm->msg;
|
||||
int ret;
|
||||
|
|
@ -1031,8 +988,7 @@ Curl_os400_inflateInit2_(z_streamp strm, int windowBits,
|
|||
return ret;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_inflate(z_streamp strm, int flush)
|
||||
int Curl_os400_inflate(z_streamp strm, int flush)
|
||||
{
|
||||
z_const char *msgb4 = strm->msg;
|
||||
int ret;
|
||||
|
|
@ -1045,8 +1001,7 @@ Curl_os400_inflate(z_streamp strm, int flush)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int
|
||||
Curl_os400_inflateEnd(z_streamp strm)
|
||||
int Curl_os400_inflateEnd(z_streamp strm)
|
||||
{
|
||||
z_const char *msgb4 = strm->msg;
|
||||
int ret;
|
||||
|
|
|
|||
|
|
@ -28,30 +28,27 @@
|
|||
#ifndef __OS400_SYS_
|
||||
#define __OS400_SYS_
|
||||
|
||||
|
||||
/* Per-thread item identifiers. */
|
||||
|
||||
typedef enum {
|
||||
LK_GSK_ERROR,
|
||||
LK_LDAP_ERROR,
|
||||
LK_CURL_VERSION,
|
||||
LK_VERSION_INFO,
|
||||
LK_VERSION_INFO_DATA,
|
||||
LK_EASY_STRERROR,
|
||||
LK_SHARE_STRERROR,
|
||||
LK_MULTI_STRERROR,
|
||||
LK_URL_STRERROR,
|
||||
LK_ZLIB_VERSION,
|
||||
LK_ZLIB_MSG,
|
||||
LK_LAST
|
||||
} localkey_t;
|
||||
|
||||
|
||||
extern char * (* Curl_thread_buffer)(localkey_t key, long size);
|
||||
LK_GSK_ERROR,
|
||||
LK_LDAP_ERROR,
|
||||
LK_CURL_VERSION,
|
||||
LK_VERSION_INFO,
|
||||
LK_VERSION_INFO_DATA,
|
||||
LK_EASY_STRERROR,
|
||||
LK_SHARE_STRERROR,
|
||||
LK_MULTI_STRERROR,
|
||||
LK_URL_STRERROR,
|
||||
LK_ZLIB_VERSION,
|
||||
LK_ZLIB_MSG,
|
||||
LK_LAST
|
||||
} localkey_t;
|
||||
|
||||
extern char *(*Curl_thread_buffer)(localkey_t key, long size);
|
||||
|
||||
/* Maximum string expansion factor due to character code conversion. */
|
||||
|
||||
#define MAX_CONV_EXPANSION 4 /* Can deal with UTF-8. */
|
||||
#define MAX_CONV_EXPANSION 4 /* Can deal with UTF-8. */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -78,34 +78,29 @@ struct itmlst_3 {
|
|||
#pragma member_alignment restore
|
||||
|
||||
#ifdef __VAX
|
||||
#define ENABLE "ENABLE"
|
||||
#define ENABLE "ENABLE"
|
||||
#define DISABLE "DISABLE"
|
||||
#else
|
||||
|
||||
#define ENABLE TRUE
|
||||
#define ENABLE TRUE
|
||||
#define DISABLE 0
|
||||
int decc$feature_get_index (const char *name);
|
||||
int decc$feature_set_value (int index, int mode, int value);
|
||||
int decc$feature_get_index(const char *name);
|
||||
int decc$feature_set_value(int index, int mode, int value);
|
||||
#endif
|
||||
|
||||
int SYS$TRNLNM(
|
||||
const unsigned long *attr,
|
||||
const struct dsc$descriptor_s *table_dsc,
|
||||
struct dsc$descriptor_s *name_dsc,
|
||||
const unsigned char *acmode,
|
||||
const struct itmlst_3 *item_list);
|
||||
int SYS$CRELNM(
|
||||
const unsigned long *attr,
|
||||
const struct dsc$descriptor_s *table_dsc,
|
||||
const struct dsc$descriptor_s *name_dsc,
|
||||
const unsigned char *acmode,
|
||||
const struct itmlst_3 *item_list);
|
||||
|
||||
int SYS$TRNLNM(const unsigned long *attr,
|
||||
const struct dsc$descriptor_s *table_dsc,
|
||||
struct dsc$descriptor_s *name_dsc,
|
||||
const unsigned char *acmode,
|
||||
const struct itmlst_3 *item_list);
|
||||
int SYS$CRELNM(const unsigned long *attr,
|
||||
const struct dsc$descriptor_s *table_dsc,
|
||||
const struct dsc$descriptor_s *name_dsc,
|
||||
const unsigned char *acmode,
|
||||
const struct itmlst_3 *item_list);
|
||||
|
||||
/* Take all the fun out of simply looking up a logical name */
|
||||
static int sys_trnlnm(const char *logname,
|
||||
char *value,
|
||||
int value_len)
|
||||
static int sys_trnlnm(const char *logname, char *value, int value_len)
|
||||
{
|
||||
const $DESCRIPTOR(table_dsc, "LNM$FILE_DEV");
|
||||
const unsigned long attr = LNM$M_CASE_BLIND;
|
||||
|
|
@ -140,8 +135,7 @@ static int sys_trnlnm(const char *logname,
|
|||
}
|
||||
|
||||
/* How to simply create a logical name */
|
||||
static int sys_crelnm(const char *logname,
|
||||
const char *value)
|
||||
static int sys_crelnm(const char *logname, const char *value)
|
||||
{
|
||||
int ret_val;
|
||||
const char *proc_table = "LNM$PROCESS_TABLE";
|
||||
|
|
@ -149,12 +143,12 @@ static int sys_crelnm(const char *logname,
|
|||
struct dsc$descriptor_s logname_dsc;
|
||||
struct itmlst_3 item_list[2];
|
||||
|
||||
proc_table_dsc.dsc$a_pointer = (char *) proc_table;
|
||||
proc_table_dsc.dsc$a_pointer = (char *)proc_table;
|
||||
proc_table_dsc.dsc$w_length = strlen(proc_table);
|
||||
proc_table_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
|
||||
proc_table_dsc.dsc$b_class = DSC$K_CLASS_S;
|
||||
|
||||
logname_dsc.dsc$a_pointer = (char *) logname;
|
||||
logname_dsc.dsc$a_pointer = (char *)logname;
|
||||
logname_dsc.dsc$w_length = strlen(logname);
|
||||
logname_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
|
||||
logname_dsc.dsc$b_class = DSC$K_CLASS_S;
|
||||
|
|
@ -172,7 +166,6 @@ static int sys_crelnm(const char *logname,
|
|||
return ret_val;
|
||||
}
|
||||
|
||||
|
||||
/* Start of DECC RTL Feature handling */
|
||||
|
||||
/*
|
||||
|
|
@ -191,7 +184,7 @@ static void set_feature_default(const char *name, int value)
|
|||
index = decc$feature_get_index(name);
|
||||
|
||||
if(index > 0)
|
||||
decc$feature_set_value (index, 0, value);
|
||||
decc$feature_set_value(index, 0, value);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -202,7 +195,7 @@ static void set_features(void)
|
|||
int use_unix_settings = 1;
|
||||
|
||||
status = sys_trnlnm("GNV$UNIX_SHELL",
|
||||
unix_shell_name, sizeof(unix_shell_name) -1);
|
||||
unix_shell_name, sizeof(unix_shell_name) - 1);
|
||||
if(!$VMS_STATUS_SUCCESS(status)) {
|
||||
use_unix_settings = 0;
|
||||
}
|
||||
|
|
@ -262,7 +255,6 @@ static void set_features(void)
|
|||
|
||||
set_feature_default("DECC$FILE_OWNER_UNIX", ENABLE);
|
||||
set_feature_default("DECC$POSIX_SEEK_STREAM_FILE", ENABLE);
|
||||
|
||||
}
|
||||
else {
|
||||
set_feature_default("DECC$FILENAME_UNIX_REPORT", ENABLE);
|
||||
|
|
@ -285,10 +277,9 @@ static void set_features(void)
|
|||
/* Commented here to prevent future bugs: A program or user should */
|
||||
/* never ever enable DECC$POSIX_STYLE_UID. */
|
||||
/* It will probably break all code that accesses UIDs */
|
||||
/* do_not_set_default ("DECC$POSIX_STYLE_UID", TRUE); */
|
||||
/* do_not_set_default("DECC$POSIX_STYLE_UID", TRUE); */
|
||||
}
|
||||
|
||||
|
||||
/* Some boilerplate to force this to be a proper LIB$INITIALIZE section */
|
||||
|
||||
#pragma nostandard
|
||||
|
|
@ -306,7 +297,7 @@ static void set_features(void)
|
|||
# endif
|
||||
#endif
|
||||
/* Set our contribution to the LIB$INITIALIZE array */
|
||||
void (* const iniarray[])(void) = {set_features };
|
||||
void (* const iniarray[])(void) = { set_features };
|
||||
#ifndef __VAX
|
||||
# if __INITIAL_POINTER_SIZE
|
||||
# pragma __pointer_size __restore
|
||||
|
|
@ -315,7 +306,6 @@ void (* const iniarray[])(void) = {set_features };
|
|||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
** Force a reference to LIB$INITIALIZE to ensure it
|
||||
** exists in the image.
|
||||
|
|
@ -324,7 +314,7 @@ int LIB$INITIALIZE(void);
|
|||
#ifdef __DECC
|
||||
#pragma extern_model strict_refdef
|
||||
#endif
|
||||
int lib_init_ref = (int) LIB$INITIALIZE;
|
||||
int lib_init_ref = (int)LIB$INITIALIZE;
|
||||
#ifdef __DECC
|
||||
#pragma extern_model restore
|
||||
#pragma standard
|
||||
|
|
|
|||
|
|
@ -50,93 +50,93 @@
|
|||
/* IF YOU UPDATE THIS FILE, UPDATE CURLMSG_VMS.H SO THAT THEY ARE IN SYNC */
|
||||
/* */
|
||||
|
||||
#define CURL_FACILITY 3841
|
||||
#define CURL_OK 251756553
|
||||
#define CURL_UNSUPPORTED_PROTOCOL 251756562
|
||||
#define CURL_FAILED_INIT 251756570
|
||||
#define CURL_URL_MALFORMAT 251756578
|
||||
#define CURL_OBSOLETE4 251756586
|
||||
#define CURL_COULDNT_RESOLVE_PROXY 251756594
|
||||
#define CURL_COULDNT_RESOLVE_HOST 251756602
|
||||
#define CURL_COULDNT_CONNECT 251756610
|
||||
#define CURL_WEIRD_SERVER_REPLY 251756618
|
||||
#define CURL_FACILITY 3841
|
||||
#define CURL_OK 251756553
|
||||
#define CURL_UNSUPPORTED_PROTOCOL 251756562
|
||||
#define CURL_FAILED_INIT 251756570
|
||||
#define CURL_URL_MALFORMAT 251756578
|
||||
#define CURL_OBSOLETE4 251756586
|
||||
#define CURL_COULDNT_RESOLVE_PROXY 251756594
|
||||
#define CURL_COULDNT_RESOLVE_HOST 251756602
|
||||
#define CURL_COULDNT_CONNECT 251756610
|
||||
#define CURL_WEIRD_SERVER_REPLY 251756618
|
||||
#define CURL_FTP_WEIRD_SERVER_REPLY CURL_WEIRD_SERVER_REPLY
|
||||
#define CURL_FTP_ACCESS_DENIED 251756626
|
||||
#define CURL_OBSOLETE10 251756634
|
||||
#define CURL_FTP_WEIRD_PASS_REPLY 251756642
|
||||
#define CURL_OBSOLETE12 251756650
|
||||
#define CURL_FTP_WEIRD_PASV_REPLY 251756658
|
||||
#define CURL_FTP_WEIRD_227_FORMAT 251756666
|
||||
#define CURL_FTP_CANT_GET_HOST 251756674
|
||||
#define CURL_OBSOLETE16 251756682
|
||||
#define CURL_FTP_COULDNT_SET_TYPE 251756690
|
||||
#define CURL_PARTIAL_FILE 251756698
|
||||
#define CURL_FTP_COULDNT_RETR_FILE 251756706
|
||||
#define CURL_OBSOLETE20 251756714
|
||||
#define CURL_QUOTE_ERROR 251756722
|
||||
#define CURL_HTTP_RETURNED_ERROR 251756730
|
||||
#define CURL_WRITE_ERROR 251756738
|
||||
#define CURL_OBSOLETE24 251756746
|
||||
#define CURL_UPLOAD_FAILED 251756754
|
||||
#define CURL_READ_ERROR 251756762
|
||||
#define CURL_OUT_OF_MEMORY 251756770
|
||||
#define CURL_OPERATION_TIMEOUTED 251756778
|
||||
#define CURL_OBSOLETE29 251756786
|
||||
#define CURL_FTP_PORT_FAILED 251756794
|
||||
#define CURL_FTP_COULDNT_USE_REST 251756802
|
||||
#define CURL_OBSOLETE32 251756810
|
||||
#define CURL_RANGE_ERROR 251756818
|
||||
#define CURL_HTTP_POST_ERROR 251756826
|
||||
#define CURL_SSL_CONNECT_ERROR 251756834
|
||||
#define CURL_BAD_DOWNLOAD_RESUME 251756842
|
||||
#define CURL_FTP_ACCESS_DENIED 251756626
|
||||
#define CURL_OBSOLETE10 251756634
|
||||
#define CURL_FTP_WEIRD_PASS_REPLY 251756642
|
||||
#define CURL_OBSOLETE12 251756650
|
||||
#define CURL_FTP_WEIRD_PASV_REPLY 251756658
|
||||
#define CURL_FTP_WEIRD_227_FORMAT 251756666
|
||||
#define CURL_FTP_CANT_GET_HOST 251756674
|
||||
#define CURL_OBSOLETE16 251756682
|
||||
#define CURL_FTP_COULDNT_SET_TYPE 251756690
|
||||
#define CURL_PARTIAL_FILE 251756698
|
||||
#define CURL_FTP_COULDNT_RETR_FILE 251756706
|
||||
#define CURL_OBSOLETE20 251756714
|
||||
#define CURL_QUOTE_ERROR 251756722
|
||||
#define CURL_HTTP_RETURNED_ERROR 251756730
|
||||
#define CURL_WRITE_ERROR 251756738
|
||||
#define CURL_OBSOLETE24 251756746
|
||||
#define CURL_UPLOAD_FAILED 251756754
|
||||
#define CURL_READ_ERROR 251756762
|
||||
#define CURL_OUT_OF_MEMORY 251756770
|
||||
#define CURL_OPERATION_TIMEOUTED 251756778
|
||||
#define CURL_OBSOLETE29 251756786
|
||||
#define CURL_FTP_PORT_FAILED 251756794
|
||||
#define CURL_FTP_COULDNT_USE_REST 251756802
|
||||
#define CURL_OBSOLETE32 251756810
|
||||
#define CURL_RANGE_ERROR 251756818
|
||||
#define CURL_HTTP_POST_ERROR 251756826
|
||||
#define CURL_SSL_CONNECT_ERROR 251756834
|
||||
#define CURL_BAD_DOWNLOAD_RESUME 251756842
|
||||
#define CURL_FILE_COULDNT_READ_FILE 251756850
|
||||
#define CURL_LDAP_CANNOT_BIND 251756858
|
||||
#define CURL_LDAP_SEARCH_FAILED 251756866
|
||||
#define CURL_OBSOLETE40 251756874
|
||||
#define CURL_FUNCTION_NOT_FOUND 251756882
|
||||
#define CURL_ABORTED_BY_CALLBACK 251756890
|
||||
#define CURL_BAD_FUNCTION_ARGUMENT 251756898
|
||||
#define CURL_OBSOLETE44 251756906
|
||||
#define CURL_INTERFACE_FAILED 251756914
|
||||
#define CURL_OBSOLETE46 251756922
|
||||
#define CURL_TOO_MANY_REDIRECTS 251756930
|
||||
#define CURL_UNKNOWN_TELNET_OPTION 251756938
|
||||
#define CURL_TELNET_OPTION_SYNTAX 251756946
|
||||
#define CURL_OBSOLETE50 251756954
|
||||
#define CURL_PEER_FAILED_VERIF 251756962
|
||||
#define CURL_GOT_NOTHING 251756970
|
||||
#define CURL_SSL_ENGINE_NOTFOUND 251756978
|
||||
#define CURL_SSL_ENGINE_SETFAILED 251756986
|
||||
#define CURL_SEND_ERROR 251756994
|
||||
#define CURL_RECV_ERROR 251757002
|
||||
#define CURL_OBSOLETE57 251757010
|
||||
#define CURL_SSL_CERTPROBLEM 251757018
|
||||
#define CURL_SSL_CIPHER 251757026
|
||||
#define CURL_SSL_CACERT 251757034
|
||||
#define CURL_BAD_CONTENT_ENCODING 251757042
|
||||
#define CURL_LDAP_INVALID_URL 251757050
|
||||
#define CURL_FILESIZE_EXCEEDED 251757058
|
||||
#define CURL_USE_SSL_FAILED 251757066
|
||||
#define CURL_SEND_FAIL_REWIND 251757074
|
||||
#define CURL_SSL_ENGINE_INITFAILED 251757082
|
||||
#define CURL_LOGIN_DENIED 251757090
|
||||
#define CURL_TFTP_NOTFOUND 251757098
|
||||
#define CURL_TFTP_PERM 251757106
|
||||
#define CURL_REMOTE_DISK_FULL 251757114
|
||||
#define CURL_TFTP_ILLEGAL 251757122
|
||||
#define CURL_TFTP_UNKNOWNID 251757130
|
||||
#define CURL_REMOTE_FILE_EXISTS 251757138
|
||||
#define CURL_TFTP_NOSUCHUSER 251757146
|
||||
#define CURL_CONV_FAILED 251757154
|
||||
#define CURL_CONV_REQD 251757162
|
||||
#define CURL_SSL_CACERT_BADFILE 251757170
|
||||
#define CURL_REMOTE_FILE_NOT_FOUND 251757178
|
||||
#define CURL_SSH 251757186
|
||||
#define CURL_SSL_SHUTDOWN_FAILED 251757194
|
||||
#define CURL_AGAIN 251757202
|
||||
#define CURL_SSL_CRL_BADFILE 251757210
|
||||
#define CURL_SSL_ISSUER_ERROR 251757218
|
||||
#define CURL_CURL_LAST 251757226
|
||||
#define CURL_LDAP_CANNOT_BIND 251756858
|
||||
#define CURL_LDAP_SEARCH_FAILED 251756866
|
||||
#define CURL_OBSOLETE40 251756874
|
||||
#define CURL_FUNCTION_NOT_FOUND 251756882
|
||||
#define CURL_ABORTED_BY_CALLBACK 251756890
|
||||
#define CURL_BAD_FUNCTION_ARGUMENT 251756898
|
||||
#define CURL_OBSOLETE44 251756906
|
||||
#define CURL_INTERFACE_FAILED 251756914
|
||||
#define CURL_OBSOLETE46 251756922
|
||||
#define CURL_TOO_MANY_REDIRECTS 251756930
|
||||
#define CURL_UNKNOWN_TELNET_OPTION 251756938
|
||||
#define CURL_TELNET_OPTION_SYNTAX 251756946
|
||||
#define CURL_OBSOLETE50 251756954
|
||||
#define CURL_PEER_FAILED_VERIF 251756962
|
||||
#define CURL_GOT_NOTHING 251756970
|
||||
#define CURL_SSL_ENGINE_NOTFOUND 251756978
|
||||
#define CURL_SSL_ENGINE_SETFAILED 251756986
|
||||
#define CURL_SEND_ERROR 251756994
|
||||
#define CURL_RECV_ERROR 251757002
|
||||
#define CURL_OBSOLETE57 251757010
|
||||
#define CURL_SSL_CERTPROBLEM 251757018
|
||||
#define CURL_SSL_CIPHER 251757026
|
||||
#define CURL_SSL_CACERT 251757034
|
||||
#define CURL_BAD_CONTENT_ENCODING 251757042
|
||||
#define CURL_LDAP_INVALID_URL 251757050
|
||||
#define CURL_FILESIZE_EXCEEDED 251757058
|
||||
#define CURL_USE_SSL_FAILED 251757066
|
||||
#define CURL_SEND_FAIL_REWIND 251757074
|
||||
#define CURL_SSL_ENGINE_INITFAILED 251757082
|
||||
#define CURL_LOGIN_DENIED 251757090
|
||||
#define CURL_TFTP_NOTFOUND 251757098
|
||||
#define CURL_TFTP_PERM 251757106
|
||||
#define CURL_REMOTE_DISK_FULL 251757114
|
||||
#define CURL_TFTP_ILLEGAL 251757122
|
||||
#define CURL_TFTP_UNKNOWNID 251757130
|
||||
#define CURL_REMOTE_FILE_EXISTS 251757138
|
||||
#define CURL_TFTP_NOSUCHUSER 251757146
|
||||
#define CURL_CONV_FAILED 251757154
|
||||
#define CURL_CONV_REQD 251757162
|
||||
#define CURL_SSL_CACERT_BADFILE 251757170
|
||||
#define CURL_REMOTE_FILE_NOT_FOUND 251757178
|
||||
#define CURL_SSH 251757186
|
||||
#define CURL_SSL_SHUTDOWN_FAILED 251757194
|
||||
#define CURL_AGAIN 251757202
|
||||
#define CURL_SSL_CRL_BADFILE 251757210
|
||||
#define CURL_SSL_ISSUER_ERROR 251757218
|
||||
#define CURL_CURL_LAST 251757226
|
||||
|
||||
#pragma __member_alignment __restore
|
||||
|
||||
|
|
|
|||
|
|
@ -35,15 +35,14 @@
|
|||
#include <stsdef.h>
|
||||
#include <errno.h>
|
||||
|
||||
unsigned long LIB$SET_SYMBOL(
|
||||
const struct dsc$descriptor_s * symbol,
|
||||
const struct dsc$descriptor_s * value,
|
||||
const unsigned long *table_type);
|
||||
unsigned long LIB$SET_SYMBOL(const struct dsc$descriptor_s *symbol,
|
||||
const struct dsc$descriptor_s *value,
|
||||
const unsigned long *table_type);
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
void *libptr;
|
||||
const char * (*ssl_version)(int t);
|
||||
const char *(*ssl_version)(int t);
|
||||
const char *version;
|
||||
|
||||
if(argc < 1) {
|
||||
|
|
@ -53,11 +52,11 @@ int main(int argc, char **argv)
|
|||
|
||||
libptr = dlopen(argv[1], 0);
|
||||
|
||||
ssl_version = (const char * (*)(int))dlsym(libptr, "SSLeay_version");
|
||||
ssl_version = (const char *(*)(int))dlsym(libptr, "SSLeay_version");
|
||||
if(!ssl_version) {
|
||||
ssl_version = (const char * (*)(int))dlsym(libptr, "ssleay_version");
|
||||
ssl_version = (const char *(*)(int))dlsym(libptr, "ssleay_version");
|
||||
if(!ssl_version) {
|
||||
ssl_version = (const char * (*)(int))dlsym(libptr, "SSLEAY_VERSION");
|
||||
ssl_version = (const char *(*)(int))dlsym(libptr, "SSLEAY_VERSION");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue