curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-14 16:12:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

os400: fix checksrc nits

Browse Source 
Closes #11789
This commit is contained in:
Daniel Stenberg 2023-09-03 18:07:45 +02:00
parent 50aa325742
commit 8c040ca3d3
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/OS400/curlcl.c
View File

@ -36,20 +36,17 @@
#define CURLPGM "CURL" #define CURLPGM "CURL"
#endif #endif
/* Variable-length string, with 16-bit length. */ /* Variable-length string, with 16-bit length. */
typedef struct { struct vary2 {
short len; short len;
char string[5000]; char string[5000];
} vary2; };
/* Arguments from CL command. */ /* Arguments from CL command. */
typedef struct { struct arguments {
char * pgm; /* Program name. */ char *pgm; /* Program name. */
vary2 * cmdargs; /* Command line arguments. */ struct vary2 *cmdargs; /* Command line arguments. */
} arguments; };
static int static int
is_ifs(char c) is_ifs(char c)
@ -130,7 +127,7 @@ parse_command_line(const char *cmdargs, size_t len,
int int
main(int argsc, arguments *args) main(int argsc, struct arguments *args)
{ {
size_t argc; size_t argc;
char **argv; char **argv;
@ -152,7 +149,7 @@ main(int argsc, arguments *args)
/* Measure arguments size. */ /* Measure arguments size. */
exitcode = parse_command_line(args->cmdargs->string, args->cmdargs->len, exitcode = parse_command_line(args->cmdargs->string, args->cmdargs->len,
&argc, NULL, &argsize, NULL); &argc, NULL, &argsize, NULL);
if(!exitcode) { if(!exitcode) {
/* Allocate space for parsed arguments. */ /* Allocate space for parsed arguments. */
@ -166,7 +163,7 @@ main(int argsc, arguments *args)
_LU_Work_Area_T *luwrka = (_LU_Work_Area_T *) _LUWRKA(); _LU_Work_Area_T *luwrka = (_LU_Work_Area_T *) _LUWRKA();
parse_command_line(args->cmdargs->string, args->cmdargs->len, parse_command_line(args->cmdargs->string, args->cmdargs->len,
&argc, argv, &argsize, (char *) (argv + argc + 1)); &argc, argv, &argsize, (char *) (argv + argc + 1));
/* Call program. */ /* Call program. */
_CALLPGMV((void *) &pgmptr, argv, argc); _CALLPGMV((void *) &pgmptr, argv, argc);

16
packages/OS400/curlmain.c
View File

@ -50,16 +50,14 @@ int ebcdic_argc;
char ** ebcdic_argv; char ** ebcdic_argv;
int int main(int argc, char **argv)
main(int argc, char **argv)
{ {
int i; int i;
int j; int j;
iconv_t cd; iconv_t cd;
size_t bytecount = 0; size_t bytecount = 0;
char * inbuf; char *inbuf;
char * outbuf; char *outbuf;
size_t inbytesleft; size_t inbytesleft;
size_t outbytesleft; size_t outbytesleft;
char dummybuf[128]; char dummybuf[128];
@ -70,8 +68,8 @@ main(int argc, char **argv)
ebcdic_argv = argv; ebcdic_argv = argv;
/* Build the encoding converter. */ /* Build the encoding converter. */
strncpy(tocode, "IBMCCSID01208", sizeof tocode); /* Use UTF-8. */ strncpy(tocode, "IBMCCSID01208", sizeof(tocode)); /* Use UTF-8. */
strncpy(fromcode, "IBMCCSID000000000010", sizeof fromcode); strncpy(fromcode, "IBMCCSID000000000010", sizeof(fromcode));
cd = iconv_open(tocode, fromcode); cd = iconv_open(tocode, fromcode);
/* Measure the arguments. */ /* Measure the arguments. */
@ -80,7 +78,7 @@ main(int argc, char **argv)
do { do {
inbytesleft = 0; inbytesleft = 0;
outbuf = dummybuf; outbuf = dummybuf;
outbytesleft = sizeof dummybuf; outbytesleft = sizeof(dummybuf);
j = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); j = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
bytecount += outbuf - dummybuf; bytecount += outbuf - dummybuf;
} while(j == -1 && errno == E2BIG); } while(j == -1 && errno == E2BIG);
@ -90,7 +88,7 @@ main(int argc, char **argv)
} }
/* Allocate memory for the ASCII arguments and vector. */ /* 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. */ /* Build the vector and convert argument encoding. */
outbuf = (char *) (argv + argc + 1); outbuf = (char *) (argv + argc + 1);