mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

update oc to fix bugs

Browse Source
This commit is contained in:
Dennis Heimbigner 2010-08-16 18:42:02 +00:00
parent e10672c0fa
commit 02aa80adf8
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oc/curlfunctions.c
View File

@ -12,7 +12,7 @@
/* Condition on libcurl version */
#ifndef HAVE_CURLOPT_KEYPASSWD
/* Set up an alias */
#define CURLOPT_KEYPASSWD CUROPT_SSLKEYPASSWD
#define CURLOPT_KEYPASSWD CURLOPT_SSLKEYPASSWD
#endif
static char* combinecredentials(const char* user, const char* pwd);

2
oc/dap.y
View File

@ -48,7 +48,7 @@ start:
| dataset datasetbody SCAN_DATA
| attr attributebody
| err errorbody
| error {dap_unrecognizedresponse(parsestate);}
| error {dap_unrecognizedresponse(parsestate); YYABORT;}
;
dataset:

11
oc/dapparse.c
View File

@ -12,6 +12,7 @@ static OCtype octypefor(Object etype);
static char* scopeduplicates(OClist* list);
static int check_int32(char* val, long* value);
/****************************************************/
/* Switch to DAS parsing SCAN_WORD definition */
@ -74,11 +75,15 @@ dap_unrecognizedresponse(DAPparsestate* state)
{
/* see if this is an HTTP error */
unsigned int httperr = 0;
char i[32];
int i;
char iv[32];
sscanf(state->lexstate->input,"%u ",&httperr);
sprintf(i,"%u",httperr);
sprintf(iv,"%u",httperr);
state->lexstate->next = state->lexstate->input;
dap_errorbody(state,i,state->lexstate->input,NULL,NULL);
/* Limit the amount of input to prevent runaway */
for(i=0;i<4096;i++) {if(state->lexstate->input[i] == '\0') break;}
state->lexstate->input[i] = '\0';
dap_errorbody(state,iv,state->lexstate->input,NULL,NULL);
}
Object