From fbdf8e062a132ef888911095d891d90e7672e693 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Thu, 7 Jun 2007 14:16:32 +0000 Subject: [PATCH] cleanup in progress - contents of purge.h, dump.h, load.h moved to common/query_rec.h and new client/query.h - definition of edg_wll_NotifChangeOp moved from client/notification.h to common/notif_rec.h --- org.glite.lb.client/Makefile | 4 +- org.glite.lb.client/interface/dump.h | 29 --------- org.glite.lb.client/interface/load.h | 26 -------- org.glite.lb.client/interface/notification.h | 15 +---- org.glite.lb.client/interface/purge.h | 59 ------------------ org.glite.lb.client/interface/query.h | 39 ++++++++++++ org.glite.lb.client/src/dump.c | 2 +- org.glite.lb.client/src/load.c | 2 +- org.glite.lb.client/src/purge.c | 2 +- org.glite.lb.common/Makefile | 2 +- org.glite.lb.common/interface/notif_rec.h | 27 ++++++++ org.glite.lb.common/interface/query_rec.h | 83 ++++++++++++++++++++++++- org.glite.lb.common/interface/xml_conversions.h | 13 +--- org.glite.lb.common/interface/xml_parse.h | 13 +--- org.glite.lb.common/src/xml_conversions.c | 9 --- org.glite.lb.common/src/xml_parse.c.T | 20 +----- 16 files changed, 160 insertions(+), 185 deletions(-) delete mode 100644 org.glite.lb.client/interface/dump.h delete mode 100644 org.glite.lb.client/interface/load.h delete mode 100644 org.glite.lb.client/interface/purge.h create mode 100644 org.glite.lb.client/interface/query.h create mode 100644 org.glite.lb.common/interface/notif_rec.h diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index abab702..a408154 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -112,8 +112,8 @@ FAKELIBOBJS:=consumer_fake.o producer_fake.o PLUSOBJS:=Event.o Job.o JobStatus.o Notification.o ServerConnection.o -HDRS:=consumer.h dump.h Job.h load.h notification.h \ - Notification.h purge.h ServerConnection.h statistics.h +HDRS:=consumer.h notification.h query.h statistics.h \ + Job.h Notification.h ServerConnection.h FAKE_HDRS:=consumer_fake.h producer_fake.h GEN_HDRS:=JobStatus.h producer.h interface_version.h diff --git a/org.glite.lb.client/interface/dump.h b/org.glite.lb.client/interface/dump.h deleted file mode 100644 index 6cc2ca1..0000000 --- a/org.glite.lb.client/interface/dump.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __GLITE_LB_DUMP_H__ -#define __GLITE_LB_DUMP_H__ - -#ident "$Header$" - -#define EDG_WLL_DUMP_NOW -1 -#define EDG_WLL_DUMP_LAST_START -2 -#define EDG_WLL_DUMP_LAST_END -3 -/* if adding new attribute, add conversion string to common/xml_conversions.c too !! */ - -typedef struct { - time_t from,to; -} edg_wll_DumpRequest; - -typedef struct { - char *server_file; - time_t from,to; -} edg_wll_DumpResult; - -/** Dump events in a given time interval - */ - -int edg_wll_DumpEvents( - edg_wll_Context, - const edg_wll_DumpRequest *, - edg_wll_DumpResult * -); - -#endif /* __GLITE_LB_DUMP_H__ */ diff --git a/org.glite.lb.client/interface/load.h b/org.glite.lb.client/interface/load.h deleted file mode 100644 index c675493..0000000 --- a/org.glite.lb.client/interface/load.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef __GLITE_LB_LOAD_H__ -#define __GLITE_LB_LOAD_H__ - -#ident "$Header$" - -typedef struct { - char *server_file; -} edg_wll_LoadRequest; - -typedef struct { - char *server_file; - time_t from,to; -} edg_wll_LoadResult; - -/** Load events from a given file into the database - * \retval EPERM operation not permitted - * \retval ENOENT file not found - */ - -int edg_wll_LoadEvents( - edg_wll_Context, - const edg_wll_LoadRequest *, - edg_wll_LoadResult * -); - -#endif /* __GLITE_LB_LOAD_H__ */ diff --git a/org.glite.lb.client/interface/notification.h b/org.glite.lb.client/interface/notification.h index 6b8a6c0..617a231 100644 --- a/org.glite.lb.client/interface/notification.h +++ b/org.glite.lb.client/interface/notification.h @@ -5,6 +5,7 @@ #include "glite/wmsutils/jobid/cjobid.h" #include "glite/lb/notifid.h" +#include "glite/lb/notif_rec.h" #include "glite/lb/context.h" #include "consumer.h" @@ -68,18 +69,6 @@ int edg_wll_NotifBind( time_t *valid ); -typedef enum _edg_wll_NotifChangeOp { - /** No operation, equal to not defined */ - EDG_WLL_NOTIF_NOOP = 0, - /** Replace notification registration with new one */ - EDG_WLL_NOTIF_REPLACE, - /** Add new condition when to be notifed */ - EDG_WLL_NOTIF_ADD, - /** Remove condition on notification */ - EDG_WLL_NOTIF_REMOVE -/* if adding new attribute, add conversion string to common/xml_conversions.c too !! */ -} edg_wll_NotifChangeOp; - /** Modify the query conditions for this notification. * * If op is either EDG_WLL_NOTIF_ADD or EDG_WLL_NOTIF_REMOVE, for the sake @@ -90,7 +79,7 @@ typedef enum _edg_wll_NotifChangeOp { * \param[in] id notification ID you are working with * \param[in] conditions same as for \ref edg_wll_NotifNew * \param[in] op action to be taken on existing conditions, - * \ref edg_wll_NotifChangeOp + * \ref edg_wll_NotifChangeOp (defined in common notif_rec.h) */ int edg_wll_NotifChange( edg_wll_Context context, diff --git a/org.glite.lb.client/interface/purge.h b/org.glite.lb.client/interface/purge.h deleted file mode 100644 index 6fe45a5..0000000 --- a/org.glite.lb.client/interface/purge.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef __GLITE_LB_PURGE_H__ -#define __GLITE_LB_PURGE_H__ - -#ident "$Header$" - -/** Purge or dump request */ -typedef struct _edg_wll_PurgeRequest { - char **jobs; /**< list of jobid's to work on */ - -/** Purge jobs that are in the given states and "untouched" at least for the - * specified interval. - * Currently applicable for CLEARED, ABORTED, CANCELLED and OTHER (catchall). - * The other array members are for future extensions. - * Negative values stand for server defaults. - */ - time_t timeout[EDG_WLL_NUMBER_OF_STATCODES]; -#define EDG_WLL_PURGE_JOBSTAT_OTHER EDG_WLL_JOB_UNDEF - - -/** - * Actions to be taken and information required. - */ - int flags; - -/** no dry run */ -#define EDG_WLL_PURGE_REALLY_PURGE 1 -/** return list of jobid matching the purge/dump criteria */ -#define EDG_WLL_PURGE_LIST_JOBS 2 -/** dump to a file on the sever */ -#define EDG_WLL_PURGE_SERVER_DUMP 4 -/** TODO: stream the dump info to the client */ -#define EDG_WLL_PURGE_CLIENT_DUMP 8 -/* ! when addning new constant, add it also to common/xml_conversions.c ! */ - - -/** private request processing data (for the reentrant functions) */ -/* TODO */ - -} edg_wll_PurgeRequest; - -/** Output data of a purge or dump */ -typedef struct _edg_wll_PurgeResult { - char *server_file; /**< filename of the dump at the server */ - char **jobs; /**< affected jobs */ -/* TODO: output of the streaming interface */ -} edg_wll_PurgeResult; - - -/** Client side purge/dump - * \retval EAGAIN only partial result returned, call repeatedly to get all - * output data - */ -int edg_wll_Purge( - edg_wll_Context ctx, - edg_wll_PurgeRequest *request, - edg_wll_PurgeResult *result -); - -#endif /* __GLITE_LB_PURGE_H__ */ diff --git a/org.glite.lb.client/interface/query.h b/org.glite.lb.client/interface/query.h new file mode 100644 index 0000000..e8ea2f2 --- /dev/null +++ b/org.glite.lb.client/interface/query.h @@ -0,0 +1,39 @@ +#ifndef __GLITE_LB_QUERY_H__ +#define __GLITE_LB_QUERY_H__ + +#ident "$Header$" + +#include +#include + +/** Client side purge + * \retval EAGAIN only partial result returned, call repeatedly to get all + * output data + */ +int edg_wll_Purge( + edg_wll_Context ctx, + edg_wll_PurgeRequest *request, + edg_wll_PurgeResult *result +); + +/** Dump events in a given time interval + */ + +int edg_wll_DumpEvents( + edg_wll_Context, + const edg_wll_DumpRequest *, + edg_wll_DumpResult * +); + +/** Load events from a given file into the database + * \retval EPERM operation not permitted + * \retval ENOENT file not found + */ + +int edg_wll_LoadEvents( + edg_wll_Context, + const edg_wll_LoadRequest *, + edg_wll_LoadResult * +); + +#endif /* __GLITE_LB_QUERY_H__ */ diff --git a/org.glite.lb.client/src/dump.c b/org.glite.lb.client/src/dump.c index 8ceec92..5e87516 100644 --- a/org.glite.lb.client/src/dump.c +++ b/org.glite.lb.client/src/dump.c @@ -17,7 +17,7 @@ #include "glite/lb/xml_parse.h" #include "glite/lb/mini_http.h" -#include "dump.h" +#include "query.h" #include "consumer.h" #define dprintf(x) { if (debug) printf x; } diff --git a/org.glite.lb.client/src/load.c b/org.glite.lb.client/src/load.c index 538e68d..efc453b 100644 --- a/org.glite.lb.client/src/load.c +++ b/org.glite.lb.client/src/load.c @@ -17,7 +17,7 @@ #include "glite/lb/xml_parse.h" #include "glite/lb/mini_http.h" -#include "load.h" +#include "query.h" #include "consumer.h" #define dprintf(x) { if (debug) printf x; } diff --git a/org.glite.lb.client/src/purge.c b/org.glite.lb.client/src/purge.c index f996c50..e791d0a 100644 --- a/org.glite.lb.client/src/purge.c +++ b/org.glite.lb.client/src/purge.c @@ -16,7 +16,7 @@ #include "glite/lb/xml_parse.h" #include "glite/lb/mini_http.h" -#include "purge.h" +#include "query.h" #include "consumer.h" #define dprintf(x) { if (debug) printf x; } diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index d2dd7e0..04f94fe 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -108,7 +108,7 @@ THRLOBJS:=${OBJS:.o=.thr.lo} HDRS:=context.h context-int.h lb_plain_io.h mini_http.h authz.h xml_parse.h \ xml_conversions.h log_proto.h events_parse.h il_string.h il_msg.h \ - escape.h ulm_parse.h trio.h lb_maildir.h connpool.h notifid.h \ + escape.h ulm_parse.h trio.h lb_maildir.h connpool.h notifid.h notif_rec.h \ query_rec.h LoggingExceptions.h CountRef.h ${PERF_HDRS} GEN_HDRS:=Event.h events.h jobstat.h diff --git a/org.glite.lb.common/interface/notif_rec.h b/org.glite.lb.common/interface/notif_rec.h new file mode 100644 index 0000000..7a4b4a3 --- /dev/null +++ b/org.glite.lb.common/interface/notif_rec.h @@ -0,0 +1,27 @@ +#ifndef __GLITE_LB_NOTIF_REC_H__ +#define __GLITE_LB_NOTIF_REC_H__ + +#ident "$Header$" + +#ifdef __cplusplus +extern "C" { +#endif + +/* Enum used by edg_wll_NotifChange */ +typedef enum _edg_wll_NotifChangeOp { + /** No operation, equal to not defined */ + EDG_WLL_NOTIF_NOOP = 0, + /** Replace notification registration with new one */ + EDG_WLL_NOTIF_REPLACE, + /** Add new condition when to be notifed */ + EDG_WLL_NOTIF_ADD, + /** Remove condition on notification */ + EDG_WLL_NOTIF_REMOVE +/* if adding new attribute, add conversion string to common/xml_conversions.c too !! */ +} edg_wll_NotifChangeOp; + +#ifdef __cplusplus +} +#endif + +#endif /* __GLITE_LB_NOTIF_REC_H__ */ diff --git a/org.glite.lb.common/interface/query_rec.h b/org.glite.lb.common/interface/query_rec.h index 8125a3c..28608d0 100644 --- a/org.glite.lb.common/interface/query_rec.h +++ b/org.glite.lb.common/interface/query_rec.h @@ -8,7 +8,7 @@ #ident "$Header$" -#include "glite/wmsutils/jobid/cjobid.h" +#include #include "context.h" #include "events.h" #include "jobstat.h" @@ -102,6 +102,87 @@ void edg_wll_QueryRecFree(edg_wll_QueryRec *); *@} end of group */ +/** + * \defgroup Structures for Server purge, dump and load + * \brief Structures for Server purge, dump and load + * + *@{ + */ + +/** Purge request */ +typedef struct _edg_wll_PurgeRequest { + char **jobs; /**< list of jobid's to work on */ + +/** Purge jobs that are in the given states and "untouched" at least for the + * specified interval. + * Currently applicable for CLEARED, ABORTED, CANCELLED and OTHER (catchall). + * The other array members are for future extensions. + * Negative values stand for server defaults. + */ + time_t timeout[EDG_WLL_NUMBER_OF_STATCODES]; +#define EDG_WLL_PURGE_JOBSTAT_OTHER EDG_WLL_JOB_UNDEF + +/** + * Actions to be taken and information required. + */ + int flags; + +/** no dry run */ +#define EDG_WLL_PURGE_REALLY_PURGE 1 +/** return list of jobid matching the purge/dump criteria */ +#define EDG_WLL_PURGE_LIST_JOBS 2 +/** dump to a file on the sever */ +#define EDG_WLL_PURGE_SERVER_DUMP 4 +/** TODO: stream the dump info to the client */ +#define EDG_WLL_PURGE_CLIENT_DUMP 8 +/* ! when addning new constant, add it also to common/xml_conversions.c ! */ + + +/** private request processing data (for the reentrant functions) */ +/* TODO */ + +} edg_wll_PurgeRequest; + +/** Output data of a purge */ +typedef struct _edg_wll_PurgeResult { + char *server_file; /**< filename of the dump at the server */ + char **jobs; /**< affected jobs */ +/* TODO: output of the streaming interface */ +} edg_wll_PurgeResult; + + +#define EDG_WLL_DUMP_NOW -1 +#define EDG_WLL_DUMP_LAST_START -2 +#define EDG_WLL_DUMP_LAST_END -3 +/* if adding new attribute, add conversion string to common/xml_conversions.c too !! */ + +/** Purge request */ +typedef struct { + time_t from,to; +} edg_wll_DumpRequest; + +/** Output data of a dump */ +typedef struct { + char *server_file; + time_t from,to; +} edg_wll_DumpResult; + + +/** Load request */ +typedef struct { + char *server_file; +} edg_wll_LoadRequest; + +/** Output data of a load */ +typedef struct { + char *server_file; + time_t from,to; +} edg_wll_LoadResult; + +/* + *@} end of group + */ + #ifdef __cplusplus } #endif diff --git a/org.glite.lb.common/interface/xml_conversions.h b/org.glite.lb.common/interface/xml_conversions.h index a542d67..c6c0df6 100644 --- a/org.glite.lb.common/interface/xml_conversions.h +++ b/org.glite.lb.common/interface/xml_conversions.h @@ -7,12 +7,7 @@ #include "events.h" #include "query_rec.h" #include "notifid.h" -/* FIXME -#include "glite/lb/purge.h" -#include "glite/lb/dump.h" -#include "glite/lb/load.h" -#include "glite/lb/notification.h" -*/ +#include "notif_rec.h" #ifdef __cplusplus extern "C" { @@ -59,21 +54,17 @@ typedef struct _edg_wll_XML_ctx { char *(*indexToTag)(); edg_wll_TagValue *tagListGlobal; edg_wll_JobStat *stsListGlobal; -/* FIXME: edg_wll_PurgeRequest purgeRequestGlobal; edg_wll_PurgeResult purgeResultGlobal; edg_wll_DumpRequest dumpRequestGlobal; edg_wll_DumpResult dumpResultGlobal; edg_wll_LoadRequest loadRequestGlobal; edg_wll_LoadResult loadResultGlobal; -*/ edg_wll_QueryRec **attrsGlobal; char *notifFunction; char *notifClientAddress; edg_wll_NotifId notifId; -/* FIXME edg_wll_NotifChangeOp notifChangeOp; -*/ time_t notifValidity; char *statsFunction; edg_wll_QueryRec **statsConditions; @@ -145,10 +136,8 @@ int edg_wll_StringTodone_code(const char *name); char *edg_wll_done_codeToString(int done_codeConst); edg_wll_QueryAttr edg_wll_StringToquery_attr(const char *name); char *edg_wll_query_attrToString(edg_wll_QueryAttr query_attrConst); -/* FIXME: edg_wll_NotifChangeOp edg_wll_StringToNotifChangeOp(const char *name); char *edg_wll_NotifChangeOpToString(edg_wll_NotifChangeOp notifChangeOpConst); -*/ #ifdef __cplusplus } // extern "C" diff --git a/org.glite.lb.common/interface/xml_parse.h b/org.glite.lb.common/interface/xml_parse.h index 259ad54..6d01731 100644 --- a/org.glite.lb.common/interface/xml_parse.h +++ b/org.glite.lb.common/interface/xml_parse.h @@ -8,12 +8,7 @@ #include "context.h" #include "query_rec.h" #include "notifid.h" -/* FIXME -#include "glite/lb/purge.h" -#include "glite/lb/dump.h" -#include "glite/lb/load.h" -#include "glite/lb/notification.h" -*/ +#include "notif_rec.h" #ifdef __cplusplus extern "C" { @@ -38,13 +33,11 @@ extern edg_wll_ErrorCode edg_wll_ParseTagList(edg_wll_Context ctx, char *message extern edg_wll_ErrorCode edg_wll_ParseStsList(edg_wll_Context ctx, char *messageBody, long len, char *tag, char *tag2, edg_wll_JobStat **stsListOut); -/* FIXME extern edg_wll_ErrorCode edg_wll_ParsePurgeResult(edg_wll_Context ctx, char *messageBody, edg_wll_PurgeResult *result); extern edg_wll_ErrorCode edg_wll_ParseDumpResult(edg_wll_Context ctx, char *messageBody, edg_wll_DumpResult *result); extern edg_wll_ErrorCode edg_wll_ParseLoadResult(edg_wll_Context ctx, char *messageBody, edg_wll_LoadResult *result); -*/ extern edg_wll_ErrorCode edg_wll_ParseIndexedAttrs(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***attrs); @@ -58,19 +51,15 @@ extern int edg_wll_JobQueryRecToXML(edg_wll_Context ctx, edg_wll_QueryRec const extern int edg_wll_QueryJobsRequestToXML(edg_wll_Context ctx, const edg_wll_QueryRec **conditions, int flags, char **send_mess); -/* FIXME extern int edg_wll_PurgeRequestToXML(edg_wll_Context ctx, const edg_wll_PurgeRequest *request, char **message); extern int edg_wll_DumpRequestToXML(edg_wll_Context ctx, const edg_wll_DumpRequest *request, char **message); extern int edg_wll_LoadRequestToXML(edg_wll_Context ctx, const edg_wll_LoadRequest *request, char **message); -*/ extern int edg_wll_IndexedAttrsRequestToXML(edg_wll_Context ctx, char **message); -/* FIXME: extern int edg_wll_NotifRequestToXML( edg_wll_Context ctx, const char *function, const edg_wll_NotifId notifId, const char *address, edg_wll_NotifChangeOp op, edg_wll_QueryRec const * const *conditions, char **message); -*/ extern int edg_wll_QuerySequenceCodeToXML(edg_wll_Context ctx, edg_wlc_JobId jobId, char **message); diff --git a/org.glite.lb.common/src/xml_conversions.c b/org.glite.lb.common/src/xml_conversions.c index e328fdf..34d2191 100644 --- a/org.glite.lb.common/src/xml_conversions.c +++ b/org.glite.lb.common/src/xml_conversions.c @@ -50,20 +50,16 @@ void edg_wll_initXMLCtx(edg_wll_XML_ctx *c) { c->tagToIndex = NULL; c->tagListGlobal = NULL; c->stsListGlobal = NULL; -/* FIXME: memset(&(c->purgeRequestGlobal),0,sizeof(c->purgeRequestGlobal)); memset(&(c->purgeResultGlobal),0,sizeof(c->purgeResultGlobal)); memset(&(c->dumpRequestGlobal),0,sizeof(c->dumpRequestGlobal)); memset(&(c->dumpResultGlobal),0,sizeof(c->dumpResultGlobal)); memset(&(c->loadRequestGlobal),0,sizeof(c->loadRequestGlobal)); memset(&(c->loadResultGlobal),0,sizeof(c->loadResultGlobal)); -*/ c->notifFunction = NULL; c->notifClientAddress = NULL; c->notifId = NULL; -/* FIXME: c->notifChangeOp = EDG_WLL_NOTIF_NOOP; -*/ c->notifValidity = -1; c->jobId = NULL; c->source = NULL; @@ -797,8 +793,6 @@ int edg_wll_string_to_stat_flags(char *cflags) } -#if 0 -/* FIXME */ char *edg_wll_purge_flags_to_string(int flags) { char *cflags = NULL, *temp_cflags = NULL; @@ -854,7 +848,6 @@ int edg_wll_string_to_purge_flags(char *cflags) return(flags); } -#endif /* Functions for conversion of DUMP constants */ @@ -962,7 +955,6 @@ static const char * const notifChangeOpConsts[] = { -/* FIXME edg_wll_NotifChangeOp edg_wll_StringToNotifChangeOp(const char *name) { int i; @@ -979,5 +971,4 @@ char *edg_wll_NotifChangeOpToString(edg_wll_NotifChangeOp notifChangeOpConst) if (notifChangeOpConst < 0 || (notifChangeOpConst) > sizeof(notifChangeOpConsts)/sizeof(notifChangeOpConsts[0])) return (char *) NULL; return strdup(notifChangeOpConsts[(int) notifChangeOpConst]); } -*/ diff --git a/org.glite.lb.common/src/xml_parse.c.T b/org.glite.lb.common/src/xml_parse.c.T index 4cf8268..9a6d9ae 100644 --- a/org.glite.lb.common/src/xml_parse.c.T +++ b/org.glite.lb.common/src/xml_parse.c.T @@ -10,7 +10,6 @@ #include "globus_config.h" #include "trio.h" -// #include "glite/lb/producer.h" #include "glite/wmsutils/jobid/cjobid.h" #include "escape.h" @@ -480,9 +479,6 @@ static void startStsList(void *data, const char *el, const char **attr) } - -/* FIXME */ -#if 0 static void startPurgeResult(void *data, const char *el, const char **attr) { edg_wll_XML_ctx *XMLCtx = data; @@ -579,7 +575,6 @@ static void startLoadResult(void *data, const char *el, const char **attr) } XMLCtx->level++; } -#endif @@ -1147,9 +1142,6 @@ static void endStsList(void *data, const char *el) - -/* FIXME: */ -#if 0 static void endPurgeResult(void *data, const char *el UNUSED_VAR) { edg_wll_XML_ctx *XMLCtx = data; @@ -1230,7 +1222,6 @@ static void endLoadResult(void *data, const char *el UNUSED_VAR) XMLCtx->char_buf_len = 0; XMLCtx->level--; } -#endif @@ -1970,8 +1961,6 @@ edg_wll_ErrorCode edg_wll_ParseStsList(edg_wll_Context ctx, char *messageBody, l } -/* FIXME */ -#if 0 /* parse purge result from client */ edg_wll_ErrorCode edg_wll_ParsePurgeResult(edg_wll_Context ctx, char *messageBody, edg_wll_PurgeResult *result) @@ -2161,7 +2150,6 @@ edg_wll_ErrorCode edg_wll_ParseLoadResult(edg_wll_Context ctx, char *messageBody edg_wll_freeXMLCtx(&XMLCtx); return errorCode; } -#endif edg_wll_ErrorCode edg_wll_ParseIndexedAttrs(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***attrs) @@ -2725,8 +2713,7 @@ int edg_wll_QueryJobsRequestToXML( } -/* FIXME */ -#if 0 + /* construct Message-Body of Request-Line for edg_wll_Purge */ int edg_wll_PurgeRequestToXML( edg_wll_Context ctx, @@ -2822,7 +2809,6 @@ int edg_wll_LoadRequestToXML( return 0; } -#endif @@ -2843,8 +2829,7 @@ int edg_wll_IndexedAttrsRequestToXML( } -/* FIXME */ -#if 0 + /* construct Message-Body of Request-Line for edg_wll_Notif* functions */ int edg_wll_NotifRequestToXML( edg_wll_Context ctx, @@ -2880,7 +2865,6 @@ int edg_wll_NotifRequestToXML( return 0; } -#endif /* construct Message-Body of Request-Line for edg_wll_QuerySequeceCode function */ -- 1.8.2.3