Renamed jobid.h in cjobid.h

Renamed jobid.c in cjobid.c

diff --git a/org.glite.wms-utils.jobid/src/jobid/Makefile.am b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
index 8ab7551..ebdc4b5 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
@@ -12,14 +12,14 @@ libglite_wms_jobid_la_SOURCES = \
        JobId.cpp \
        JobIdExceptions.cpp \
        manipulation.cpp \
-       jobid.c \
+       cjobid.c \
        strmd5.c
 
 jobidincludedir = $(includedir)/glite/wms/jobid
 jobidinclude_HEADERS = \
        JobId.h \
        JobIdExceptions.h \
-       jobid.h \
+       cjobid.h \
        manipulation.h \
        strmd5.h \
        jobid_namespace.h

diff --git a/org.glite.wms-utils.jobid/src/jobid/jobid.c b/org.glite.wms-utils.jobid/src/jobid/cjobid.c
similarity index 100%
rename from org.glite.wms-utils.jobid/src/jobid/jobid.c
rename to org.glite.wms-utils.jobid/src/jobid/cjobid.c

diff --git a/org.glite.wms-utils.jobid/src/jobid/jobid.h b/org.glite.wms-utils.jobid/src/jobid/cjobid.h
similarity index 100%
rename from org.glite.wms-utils.jobid/src/jobid/jobid.h
rename to org.glite.wms-utils.jobid/src/jobid/cjobid.h

diff --git a/org.glite.wms-utils.jobid/src/jobid/jobid-c.h b/org.glite.wms-utils.jobid/src/jobid/jobid-c.h
deleted file mode 100755 (executable)
index 47e54e5..0000000
--- a/org.glite.wms-utils.jobid/src/jobid/jobid-c.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef _GLITE_JOBID_H
-#define _GLITE_JOBID_H
-
-/*!
- * \file common/jobid/jobid-c.h
- * \brief L&B consumer API
- */
-
-#ident "$Header$"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _edg_wlc_JobId *edg_wlc_JobId;
-
-#define GLITE_WMSC_JOBID_DEFAULT_PORT 9000 /**< Default port where bookkeeping server listens */
-#define GLITE_WMSC_JOBID_PROTO_PREFIX "https://" /**< JobId protocol prefix */
-
-
-/* All the pointer functions return malloc'ed objects (or NULL on error) */
-
-/**
- * Create a Job ID.
- * See the lb_draft document for details on its construction and components
- * \param bkserver book keeping server hostname
- * \param port port for the bk service
- * \param jobid new created job id
- * \ret al 0 success
- * \retval EINVAL invalid bkserver
- * \retval ENOMEM if memory allocation fails
- */
-int edg_wlc_JobIdCreate(const char * bkserver, int port, edg_wlc_JobId * jobid);
-
-/**
- * Recreate a Job ID
- * \param bkserver bookkeeping server hostname
- * \param port port for the bk service
- * \param unique string which represent created jobid (if NULL then new
- * one is created)
- * \param jobid new created job id
- * \retval 0 success
- * \retval EINVAL invalid bkserver
- * \retval ENOMEM if memory allocation fails
- */
-int edg_wlc_JobIdRecreate(const char *bkserver, int port, const char * unique, edg_wlc_JobId * jobid);
-
-/**
- * Create copy of Job ID
- * \param in jobid for duplication
- * \param jobid  duplicated jobid
- * \retval 0 for success
- * \retval EINVAL invalid jobid
- * \retval ENOMEM if memory allocation fails
- */
-int edg_wlc_JobIdDup(const edg_wlc_JobId in, edg_wlc_JobId * jobid);
-
-/*
- * Free jobid structure
- * \param jobid for dealocation
- */
-void edg_wlc_JobIdFree(edg_wlc_JobId jobid);
-
-/**
- * Parse Job ID string and creates jobid structure
- * \param jobidstr string representation of jobid
- * \param jobid parsed job id
- * \retval 0 for success
- * \retval EINVAL jobidstr can't be parsed
- * \retval ENOMEM if memory allocation fails
- */
-int edg_wlc_JobIdParse(const char* jobidstr, edg_wlc_JobId * jobid);
-
-/**
- * Unparse Job ID (produce the string form of JobId).
- * \param jobid to be converted to string
- * \return allocated string which represents jobid
- */
-char* edg_wlc_JobIdUnparse(const edg_wlc_JobId jobid);
-
-/**
- * Extract bookkeeping server address (address:port)
- * \param jobid from which the bkserver address should be extracted
- * \retval pointer to allocated string with bkserver address
- * \retval NULL if jobid is 0 or memory allocation fails
- */
-char* edg_wlc_JobIdGetServer(const edg_wlc_JobId jobid);
-
-/**
- * Extract bookkeeping server address and port
- * \param jobid from which the bkserver address should be extracted
- * \param srvName pointer where to return server name
- * \param srvPort pointer where to return server port
- *     */
-void edg_wlc_JobIdGetServerParts(const edg_wlc_JobId jobid, char **srvName, unsigned int *srvPort);
-
-/**
- * Extract unique string 
- * \param jobid
- * \retval pointer to allocated unique string representing jobid
- * \retval NULL if jobid is 0 or memory allocation fails
- */
-char* edg_wlc_JobIdGetUnique(const edg_wlc_JobId jobid);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GLITE_JOBID_H */