From: Jiří Filipovič <fila@ics.muni.cz>
Date: Thu, 25 Jan 2007 12:52:48 +0000 (+0000)
Subject: Building problems has been solved.
X-Git-Tag: gridsite-core_R_1_4_0~32
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=fe84da897069a886eaf1d574a42bf3cc14e41efd;p=jra1mw.git

Building problems has been solved.
---

diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c
index 9962d66..087af71 100644
--- a/org.glite.jp.primary/src/feed.c
+++ b/org.glite.jp.primary/src/feed.c
@@ -314,7 +314,7 @@ int glite_jpps_match_file(
 			}
 
 			for (i=0; attrs[i]; i++) 
-				if (!pd[pi]->ops.attr(pd[pi]->fpctx,ph,attrs[i],&oneval)) {
+				if (!pd[pi]->ops.attr(pd[pi]->fpctx,ph,"",attrs[i],&oneval)) {
 				/* XXX: ignore error */
 					for (j=0; oneval[j].name; j++);
 					vals = realloc(vals,(nvals+j+1) * sizeof *vals);
diff --git a/org.glite.jp.primary/src/new_ftp_backend.c b/org.glite.jp.primary/src/new_ftp_backend.c
index ccdb005..227c134 100644
--- a/org.glite.jp.primary/src/new_ftp_backend.c
+++ b/org.glite.jp.primary/src/new_ftp_backend.c
@@ -22,7 +22,6 @@
 
 #include "feed.h"
 #include "tags.h"
-#include "tags2.h"
 #include "backend.h"
 #include "db.h"
 
diff --git a/org.glite.jp.primary/src/tags.c b/org.glite.jp.primary/src/tags.c
index 764eb2d..1d4f4ae 100644
--- a/org.glite.jp.primary/src/tags.c
+++ b/org.glite.jp.primary/src/tags.c
@@ -3,6 +3,9 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <stdint.h>
 
 #include <glite/jp/types.h>
 #include "tags.h"
@@ -11,8 +14,10 @@
 /* magic name_len value_len binary sequence timestamp */
 #define HEADER "JP#TAG# %05u %012lu %c %05u %012lu#"
 #define HEADER_SIZE 48
+#define TAGS_MAGIC 0x74c016f2   /* two middle digits encode version, i.e. 01 */
+
 
-int glite_jpps_tag_append(
+/*int glite_jpps_tag_append(
 	glite_jp_context_t ctx,
 	void *handle,
 	const glite_jp_tagval_t *tag
@@ -127,7 +132,7 @@ int glite_jpps_tag_read(
 		err.desc = "No more tags in the file";
 		goto error_out;
 	}
-	/* #define HEADER "JP#TAG# %05u %012lu %c %05u %012lu#" */
+	// #define HEADER "JP#TAG# %05u %012lu %c %05u %012lu#" 
 	if (sscanf(hdr, HEADER, &nlen, &vlen, &binary, &sequence, &timestamp) < 5) {
 		err.code = EILSEQ;
 		err.desc = "Incorrect tag header format";
@@ -170,14 +175,14 @@ error_out:
 	free(name);
 	free(value);
 	return glite_jp_stack_error(ctx,&err);
-}
+}*/
 
 /*
 int glite_jpps_tag_read(glite_jp_context_t, void *, off_t, glite_jp_tagval_t *, size_t);
 int glite_jpps_tag_readall(glite_jp_context_t, void *, glite_jp_tagval_t **);
 */
 
-int glite_jpps_tag_readall(
+/*int glite_jpps_tag_readall(
 	glite_jp_context_t ctx,
 	void *handle,
 	glite_jp_tagval_t **tags_out
@@ -230,11 +235,11 @@ error_out:
 	}
 	free(tags);
 	return glite_jp_stack_error(ctx,&err);
-}
+}*/
 
 int tag_append(void *fpctx,void *bhandle,glite_jp_attrval_t * tag)
 {
-        va_list ap;
+        //va_list ap;
         char    *hdr,*rec;
         glite_jp_context_t      ctx = fpctx;
         uint32_t                magic,hlen,rlen,rlen_n;
diff --git a/org.glite.jp.primary/src/tags.h b/org.glite.jp.primary/src/tags.h
index c616122..7fd524f 100644
--- a/org.glite.jp.primary/src/tags.h
+++ b/org.glite.jp.primary/src/tags.h
@@ -5,5 +5,6 @@ struct tags_handle {
 };
 
 int tag_append(void *fpctx,void *bhandle,glite_jp_attrval_t * tag);
-int glite_jpps_tag_append(glite_jp_context_t,void *,const char *, const char *);
+//int glite_jpps_tag_append(glite_jp_context_t,void *,const char *, const char *);
+//int glite_jpps_tag_append(glite_jp_context_t,void *,const glite_jp_tagval_t *);
 int tag_attr(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t **attrval);