From 398e91e1bc2e1eda04a938aae212c9e21868b2e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20Salvet?= Date: Mon, 29 Nov 2004 22:04:09 +0000 Subject: [PATCH] Fixed typing error and missing prototypes. --- org.glite.lb.client/examples/job_reg.c | 4 ++-- org.glite.lb.common/src/ulm_parse.c | 4 ++-- org.glite.lb.common/test/test_gss.cpp | 2 +- org.glite.lb.server/src/bkserverd.c | 1 + org.glite.lb.server/src/jobstat_supp.c | 6 +++--- org.glite.lb.server/src/openserver.c | 2 +- org.glite.lb.server/src/ws_query.c | 3 ++- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/org.glite.lb.client/examples/job_reg.c b/org.glite.lb.client/examples/job_reg.c index 97b5065..2106786 100644 --- a/org.glite.lb.client/examples/job_reg.c +++ b/org.glite.lb.client/examples/job_reg.c @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) if (num_subjobs) for (i=0; subjobs[i]; i++) { char *job_s = edg_wlc_JobIdUnparse(subjobs[i]); - printf("EDG_WL_SUB_JOBID[%lu]=\"%s\"\n",i,job_s); + printf("EDG_WL_SUB_JOBID[%d]=\"%s\"\n",i,job_s); free(job_s); } @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) asprintf(jdls+i, "JDL of subjob #%d\n", i+1); } - if (edg_wll_RegisterSubjobs(ctx, jobid, jdls, NULL, subjobs)) { + if (edg_wll_RegisterSubjobs(ctx, jobid, (const char **) jdls, NULL, subjobs)) { char *et,*ed; edg_wll_Error(ctx,&et,&ed); fprintf(stderr,"edg_wll_RegisterSubjobs: %s (%s)\n", et, ed); diff --git a/org.glite.lb.common/src/ulm_parse.c b/org.glite.lb.common/src/ulm_parse.c index 1a40d57..2525a3e 100644 --- a/org.glite.lb.common/src/ulm_parse.c +++ b/org.glite.lb.common/src/ulm_parse.c @@ -163,8 +163,8 @@ int edg_wll_ULMProcessParseTable(p_edg_wll_ULMFields this) else qmCnt--; } if ((qmCnt == 0) && (!isspace(this->raw[i+1]) && (this->raw[i+1] != '\0'))) { - fprintf(stderr,"%s: PARSE ERROR: Disallowed character ('%c') after ending '%c'at i=%d size=%d char=%d.\n", - func,this->raw[i+1],ULM_QM,i,size,this->raw[i+1]); + fprintf(stderr,"%s: PARSE ERROR: Disallowed character ('%c') after ending '%c'at i=%d size=%lu char=%d.\n", + func,this->raw[i+1],ULM_QM,i,(unsigned long)size,this->raw[i+1]); for (j=0; j<=i; j++) fputc(this->raw[j],stderr); fputc(ULM_LF,stderr); return ULM_PARSE_ERROR; diff --git a/org.glite.lb.common/test/test_gss.cpp b/org.glite.lb.common/test/test_gss.cpp index 97688c3..d6df484 100644 --- a/org.glite.lb.common/test/test_gss.cpp +++ b/org.glite.lb.common/test/test_gss.cpp @@ -116,7 +116,7 @@ void GSSTest::echo() err = edg_wll_gss_read_full(&conn, buf2, strlen(buf)+1, &timeout, &total, &stat); CPPUNIT_ASSERT_MESSAGE("edg_wll_gss_read_full()", !err); - CPPUNIT_ASSERT(strlen(buf)+1 == (int) total && !strcmp(buf,buf2) ); + CPPUNIT_ASSERT(strlen(buf)+1 == total && !strcmp(buf,buf2) ); edg_wll_gss_close(&conn, &timeout); diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index 5204b7b..caa56f4 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -29,6 +29,7 @@ #ifdef GLITE_LB_SERVER_WITH_WS #include +int soap_serve(struct soap*); #endif /* GLITE_LB_SERVER_WITH_WS */ #include "glite/lb/srvbones.h" diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c index dcbe4f1..b8f607d 100644 --- a/org.glite.lb.server/src/jobstat_supp.c +++ b/org.glite.lb.server/src/jobstat_supp.c @@ -48,7 +48,7 @@ static char *enc_string(char *old, char *item) if (item == NULL) { asprintf(&out,"%s-1 ", old); } else { - asprintf(&out,"%s%d %s",old, strlen(item), item); + asprintf(&out,"%s%ld %s",old, (long)strlen(item), item); } free(old); return out; @@ -57,10 +57,10 @@ static char *enc_string(char *old, char *item) static char *dec_string(char *in, char **rest) { int scret; - int len = -1; + long len = -1; char *out; - scret = sscanf(in, "%d", &len); + scret = sscanf(in, "%ld", &len); if (scret < 1) { *rest = NULL; return NULL; diff --git a/org.glite.lb.server/src/openserver.c b/org.glite.lb.server/src/openserver.c index 5b34974..44c7854 100644 --- a/org.glite.lb.server/src/openserver.c +++ b/org.glite.lb.server/src/openserver.c @@ -3,7 +3,7 @@ #include #include "glite/lb/consumer.h" -#include "glite/lb/context.h" +#include "glite/lb/context-int.h" #include "lbs_db.h" diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c index b37a9f2..b59fcf6 100644 --- a/org.glite.lb.server/src/ws_query.c +++ b/org.glite.lb.server/src/ws_query.c @@ -77,7 +77,8 @@ int edgwll2__QueryJobs( edg_wll_SetError(ctx, ENOMEM, "Couldn't create internal structures"); goto cleanup; } - if ( edg_wll_QueryJobsServer(ctx, qr, fl, &jobsOut, &statesOut) ) goto cleanup; + if ( edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)qr, fl, + &jobsOut, &statesOut) ) goto cleanup; if ( edg_wll_JobsQueryResToSoap(soap, jobsOut, statesOut, out) ) goto cleanup; ret = SOAP_OK; -- 1.8.2.3