[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r4827 - GNUnet/src/applications/fs/ecrs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r4827 - GNUnet/src/applications/fs/ecrs |
|
Date: |
Mon, 28 May 2007 12:55:07 -0600 (MDT) |
Author: grothoff
Date: 2007-05-28 12:55:06 -0600 (Mon, 28 May 2007)
New Revision: 4827
Modified:
GNUnet/src/applications/fs/ecrs/directorytest.c
GNUnet/src/applications/fs/ecrs/metatest.c
GNUnet/src/applications/fs/ecrs/metatest2.c
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/ecrs/uritest.c
Log:
minor cleanup fixes
Modified: GNUnet/src/applications/fs/ecrs/directorytest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directorytest.c 2007-05-28 11:11:12 UTC
(rev 4826)
+++ GNUnet/src/applications/fs/ecrs/directorytest.c 2007-05-28 18:55:06 UTC
(rev 4827)
@@ -69,7 +69,8 @@
int q;
char uri[512];
char txt[128];
-
+ int ret = 0;
+
cls.max = i;
fis = MALLOC(sizeof(ECRS_FileInfo) * i);
for (p=0;p<i;p++) {
@@ -88,8 +89,15 @@
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.%u",
p);
fis[p].uri = ECRS_stringToUri(NULL, uri);
- if (fis[p].uri == NULL)
+ if (fis[p].uri == NULL) {
+ ECRS_freeMetaData(fis[p].meta);
+ while (--p > 0) {
+ ECRS_freeMetaData(fis[p].meta);
+ ECRS_freeUri(fis[p].uri);
+ }
+ FREE(fis);
ABORT(); /* error in testcase */
+ }
}
meta = ECRS_createMetaData();
ECRS_addToMetaData(meta,
@@ -103,8 +111,15 @@
&dlen,
i,
fis,
- meta))
+ meta)) {
+ ECRS_freeMetaData(meta);
+ for (p=0;p<i;p++) {
+ ECRS_freeMetaData(fis[p].meta);
+ ECRS_freeUri(fis[p].uri);
+ }
+ FREE(fis);
ABORT();
+ }
cls.pos = 0;
cls.fi = fis;
if (i != ECRS_listDirectory(NULL,
@@ -113,12 +128,16 @@
&meta2,
&processor,
&cls)) {
- printf("expected %u\n", i);
- ABORT();
+ printf("expected %u\n", i);
+ ret = 1;
+ goto END;
}
if (! ECRS_equalsMetaData(meta,
- meta2))
- ABORT();
+ meta2)) {
+ ret = 1;
+ goto END;
+ }
+ END:
ECRS_freeMetaData(meta);
ECRS_freeMetaData(meta2);
for (p=0;p<i;p++) {
@@ -126,7 +145,7 @@
ECRS_freeUri(fis[p].uri);
}
FREE(fis);
- return 0;
+ return ret;
}
int main(int argc, char * argv[]) {
Modified: GNUnet/src/applications/fs/ecrs/metatest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/metatest.c 2007-05-28 11:11:12 UTC (rev
4826)
+++ GNUnet/src/applications/fs/ecrs/metatest.c 2007-05-28 18:55:06 UTC (rev
4827)
@@ -30,7 +30,7 @@
#include "gnunet_ecrs_lib.h"
#include "ecrs.h"
-#define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__);
return 1; }
+#define ABORT(m) { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); if
(m != NULL) ECRS_freeMetaData(m); return 1; }
static int testMeta(int i) {
struct ECRS_MetaData * m;
@@ -41,42 +41,42 @@
m = ECRS_createMetaData();
if (OK != ECRS_addToMetaData(m,
EXTRACTOR_TITLE,
- "TestTitle"))
- ABORT();
+ "TestTitle"))
+ ABORT(m);
if (OK != ECRS_addToMetaData(m,
EXTRACTOR_AUTHOR,
- "TestTitle"))
- ABORT();
+ "TestTitle"))
+ ABORT(m);
if (OK == ECRS_addToMetaData(m,
EXTRACTOR_TITLE,
"TestTitle")) /* dup! */
- ABORT();
+ ABORT(m);
if (OK == ECRS_addToMetaData(m,
EXTRACTOR_AUTHOR,
"TestTitle")) /* dup! */
- ABORT();
+ ABORT(m);
if (2 != ECRS_getMetaData(m, NULL, NULL))
- ABORT();
+ ABORT(m);
if (OK != ECRS_delFromMetaData(m,
EXTRACTOR_AUTHOR,
"TestTitle"))
- ABORT();
+ ABORT(m);
if (OK == ECRS_delFromMetaData(m,
EXTRACTOR_AUTHOR,
"TestTitle")) /* already gone */
- ABORT();
+ ABORT(m);
if (1 != ECRS_getMetaData(m, NULL, NULL))
- ABORT();
+ ABORT(m);
if (OK != ECRS_delFromMetaData(m,
EXTRACTOR_TITLE,
"TestTitle"))
- ABORT();
+ ABORT(m);
if (OK == ECRS_delFromMetaData(m,
EXTRACTOR_TITLE,
"TestTitle")) /* already gone */
- ABORT();
+ ABORT(m);
if (0 != ECRS_getMetaData(m, NULL, NULL))
- ABORT();
+ ABORT(m);
val = MALLOC(256);
for (j=0;j<i;j++) {
SNPRINTF(val, 256, "%s.%d",
@@ -85,11 +85,11 @@
if (OK != ECRS_addToMetaData(m,
EXTRACTOR_UNKNOWN,
val))
- ABORT();
+ ABORT(m);
}
FREE(val);
if (i != ECRS_getMetaData(m, NULL, NULL))
- ABORT();
+ ABORT(m);
size = ECRS_sizeofMetaData(m,
ECRS_SERIALIZE_FULL);
@@ -98,15 +98,17 @@
m,
val,
size,
- ECRS_SERIALIZE_FULL))
- ABORT();
+ ECRS_SERIALIZE_FULL)) {
+ FREE(val);
+ ABORT(m);
+ }
ECRS_freeMetaData(m);
m = ECRS_deserializeMetaData(NULL,
val,
size);
- if (m == NULL)
- ABORT();
FREE(val);
+ if (m == NULL)
+ ABORT(m);
val = MALLOC(256);
for (j=0;j<i;j++) {
SNPRINTF(val, 256, "%s.%d",
@@ -114,13 +116,15 @@
j);
if (OK != ECRS_delFromMetaData(m,
EXTRACTOR_UNKNOWN,
- val))
- ABORT();
+ val)) {
+ FREE(val);
+ ABORT(m);
+ }
}
FREE(val);
- if (0 != ECRS_getMetaData(m, NULL, NULL))
- ABORT();
-
+ if (0 != ECRS_getMetaData(m, NULL, NULL)) {
+ ABORT(m);
+ }
ECRS_freeMetaData(m);
return 0;
}
@@ -149,8 +153,12 @@
meta,
data,
size * 4,
- ECRS_SERIALIZE_FULL))
+ ECRS_SERIALIZE_FULL)) {
+ ECRS_freeMetaData(meta);
+ FREE(data);
ABORT();
+ }
+ ECRS_freeMetaData(meta);
FREE(data);
return 0;
}
Modified: GNUnet/src/applications/fs/ecrs/metatest2.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/metatest2.c 2007-05-28 11:11:12 UTC (rev
4826)
+++ GNUnet/src/applications/fs/ecrs/metatest2.c 2007-05-28 18:55:06 UTC (rev
4827)
@@ -40,12 +40,16 @@
m = ECRS_createMetaData();
if (OK != ECRS_addToMetaData(m,
EXTRACTOR_UNKNOWN,
- "link"))
+ "link")) {
+ ECRS_freeMetaData(m);
ABORT();
+ }
if (OK != ECRS_addToMetaData(m,
EXTRACTOR_FILENAME,
- "lib-link.m4"))
+ "lib-link.m4")) {
+ ECRS_freeMetaData(m);
ABORT();
+ }
size = ECRS_sizeofMetaData(m,
ECRS_SERIALIZE_FULL);
val = MALLOC(size);
@@ -53,15 +57,18 @@
m,
val,
size,
- ECRS_SERIALIZE_FULL))
+ ECRS_SERIALIZE_FULL)) {
+ ECRS_freeMetaData(m);
+ FREE(val);
ABORT();
+ }
ECRS_freeMetaData(m);
m = ECRS_deserializeMetaData(NULL,
val,
size);
+ FREE(val);
if (m == NULL)
ABORT();
- FREE(val);
ECRS_freeMetaData(m);
return 0;
}
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2007-05-28 11:11:12 UTC (rev
4826)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2007-05-28 18:55:06 UTC (rev
4827)
@@ -227,10 +227,11 @@
nb->rootEntry = *rootEntry;
- GE_ASSERT(ectx, OK == sign(hk,
- mdsize + 3 * sizeof(HashCode512),
- &nb->identifier,
- &nb->signature));
+ GE_ASSERT(ectx,
+ OK == sign(hk,
+ mdsize + 3 * sizeof(HashCode512),
+ &nb->identifier,
+ &nb->signature));
if (OK != FS_insert(sock, value)) {
FREE(rootURI);
FREE(value);
@@ -280,6 +281,7 @@
/* extra check: verify sig */
freePrivateKey(pk);
if (OK != FS_insert(sock, knvalue)) {
+ GE_BREAK(ectx, 0);
FREE(rootURI);
ECRS_deleteNamespace(ectx, cfg, name);
FREE(cpy);
Modified: GNUnet/src/applications/fs/ecrs/uritest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uritest.c 2007-05-28 11:11:12 UTC (rev
4826)
+++ GNUnet/src/applications/fs/ecrs/uritest.c 2007-05-28 18:55:06 UTC (rev
4827)
@@ -41,17 +41,24 @@
ret = ECRS_stringToUri(NULL, "gnunet://ecrs/ksk/foo+bar");
if (ret == NULL)
ABORT();
- if (! ECRS_isKeywordUri(ret))
+ if (! ECRS_isKeywordUri(ret)) {
+ ECRS_freeUri(ret);
ABORT();
+ }
if ( (2 != ret->data.ksk.keywordCount) ||
(0 != strcmp("foo", ret->data.ksk.keywords[0])) ||
- (0 != strcmp("bar", ret->data.ksk.keywords[1])) )
+ (0 != strcmp("bar", ret->data.ksk.keywords[1])) ) {
+ ECRS_freeUri(ret);
ABORT();
+ }
uri = ECRS_uriToString(ret);
if (0 != strcmp(uri,
- "gnunet://ecrs/ksk/foo+bar"))
+ "gnunet://ecrs/ksk/foo+bar")) {
+ FREE(uri);
+ ECRS_freeUri(ret);
ABORT();
+ }
FREE(uri);
ECRS_freeUri(ret);
return 0;
@@ -144,15 +151,22 @@
ret = ECRS_stringToUri(NULL,
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
if (ret == NULL)
ABORT();
- if (ECRS_isKeywordUri(ret))
+ if (ECRS_isKeywordUri(ret)) {
+ ECRS_freeUri(ret);
ABORT();
- if (! ECRS_isNamespaceUri(ret))
+ }
+ if (! ECRS_isNamespaceUri(ret)) {
+ ECRS_freeUri(ret);
ABORT();
+ }
uri = ECRS_uriToString(ret);
if (0 != strcmp(uri,
-
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/TOJB1NAAUVJKJAGQHRHS22N9I8VM32C0ESN4EFS836IT950E1MP7LGC5V2GE3LFO9U4BP23VQPTH8DPIOC2CONT9LM76ULVL00KAHVO"))
+
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/TOJB1NAAUVJKJAGQHRHS22N9I8VM32C0ESN4EFS836IT950E1MP7LGC5V2GE3LFO9U4BP23VQPTH8DPIOC2CONT9LM76ULVL00KAHVO"))
{
+ ECRS_freeUri(ret);
+ FREE(uri);
ABORT();
+ }
FREE(uri);
ECRS_freeUri(ret);
return 0;
@@ -171,16 +185,24 @@
ret = ECRS_stringToUri(NULL,
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42");
if (ret == NULL)
ABORT();
- if (ECRS_isKeywordUri(ret))
+ if (ECRS_isKeywordUri(ret)) {
+ ECRS_freeUri(ret);
ABORT();
- if (ECRS_isNamespaceUri(ret))
+ }
+ if (ECRS_isNamespaceUri(ret)) {
+ ECRS_freeUri(ret);
ABORT();
- if (ntohll(ret->data.fi.file_length) != 42)
+ }
+ if (ntohll(ret->data.fi.file_length) != 42) {
+ ECRS_freeUri(ret);
ABORT();
+ }
uri = ECRS_uriToString(ret);
if (0 != strcmp(uri,
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42"))
{
+ FREE(uri);
+ ECRS_freeUri(ret);
ABORT();
}
FREE(uri);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r4827 - GNUnet/src/applications/fs/ecrs,
gnunet <=