[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5769 - in GNUnet/src: applications/fs/ecrs applications/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5769 - in GNUnet/src: applications/fs/ecrs applications/fs/fsui applications/fs/tools include |
|
Date: |
Sun, 25 Nov 2007 06:00:36 -0700 (MST) |
Author: grothoff
Date: 2007-11-25 06:00:36 -0700 (Sun, 25 Nov 2007)
New Revision: 5769
Modified:
GNUnet/src/applications/fs/ecrs/directorytest.c
GNUnet/src/applications/fs/ecrs/meta.c
GNUnet/src/applications/fs/ecrs/metatest.c
GNUnet/src/applications/fs/ecrs/metatest2.c
GNUnet/src/applications/fs/ecrs/parser.c
GNUnet/src/applications/fs/fsui/downloadtest.c
GNUnet/src/applications/fs/fsui/fsuitest.c
GNUnet/src/applications/fs/fsui/searchtest.c
GNUnet/src/applications/fs/fsui/serializetest.c
GNUnet/src/applications/fs/fsui/serializetest2.c
GNUnet/src/applications/fs/fsui/serializetest4.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/include/gnunet_ecrs_lib.h
GNUnet/src/include/gnunet_fsui_lib.h
Log:
typo
Modified: GNUnet/src/applications/fs/ecrs/directorytest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directorytest.c 2007-11-25 12:44:14 UTC
(rev 5768)
+++ GNUnet/src/applications/fs/ecrs/directorytest.c 2007-11-25 13:00:36 UTC
(rev 5769)
@@ -84,9 +84,9 @@
{
GNUNET_snprintf (txt, 128, "%u -- %u\n", p, q);
GNUNET_ECRS_meta_data_insert (fis[p].meta,
- q %
- EXTRACTOR_getHighestKeywordTypeNumber
- (), txt);
+ q %
+ EXTRACTOR_getHighestKeywordTypeNumber
+ (), txt);
}
GNUNET_snprintf (uri,
512,
Modified: GNUnet/src/applications/fs/ecrs/meta.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/meta.c 2007-11-25 12:44:14 UTC (rev
5768)
+++ GNUnet/src/applications/fs/ecrs/meta.c 2007-11-25 13:00:36 UTC (rev
5769)
@@ -80,7 +80,7 @@
*/
int
GNUNET_ECRS_meta_data_insert (MetaData * md,
- EXTRACTOR_KeywordType type, const char *data)
+ EXTRACTOR_KeywordType type, const char *data)
{
int idx;
Modified: GNUnet/src/applications/fs/ecrs/metatest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/metatest.c 2007-11-25 12:44:14 UTC (rev
5768)
+++ GNUnet/src/applications/fs/ecrs/metatest.c 2007-11-25 13:00:36 UTC (rev
5769)
@@ -47,9 +47,9 @@
if (GNUNET_OK !=
GNUNET_ECRS_meta_data_insert (m, EXTRACTOR_AUTHOR, "TestTitle"))
ABORT (m);
- if (GNUNET_OK == GNUNET_ECRS_meta_data_insert (m, EXTRACTOR_TITLE,
"TestTitle")) /* dup! */
+ if (GNUNET_OK == GNUNET_ECRS_meta_data_insert (m, EXTRACTOR_TITLE,
"TestTitle")) /* dup! */
ABORT (m);
- if (GNUNET_OK == GNUNET_ECRS_meta_data_insert (m, EXTRACTOR_AUTHOR,
"TestTitle")) /* dup! */
+ if (GNUNET_OK == GNUNET_ECRS_meta_data_insert (m, EXTRACTOR_AUTHOR,
"TestTitle")) /* dup! */
ABORT (m);
if (2 != GNUNET_ECRS_meta_data_get_contents (m, NULL, NULL))
ABORT (m);
@@ -133,9 +133,9 @@
{
GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q);
GNUNET_ECRS_meta_data_insert (meta,
- q %
- EXTRACTOR_getHighestKeywordTypeNumber (),
- txt);
+ q %
+ EXTRACTOR_getHighestKeywordTypeNumber (),
+ txt);
}
size =
GNUNET_ECRS_meta_data_get_serialized_size (meta,
Modified: GNUnet/src/applications/fs/ecrs/metatest2.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/metatest2.c 2007-11-25 12:44:14 UTC (rev
5768)
+++ GNUnet/src/applications/fs/ecrs/metatest2.c 2007-11-25 13:00:36 UTC (rev
5769)
@@ -40,7 +40,8 @@
unsigned int size;
m = GNUNET_ECRS_meta_data_create ();
- if (GNUNET_OK != GNUNET_ECRS_meta_data_insert (m, EXTRACTOR_UNKNOWN, "link"))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_meta_data_insert (m, EXTRACTOR_UNKNOWN, "link"))
{
GNUNET_ECRS_meta_data_destroy (m);
ABORT ();
Modified: GNUnet/src/applications/fs/ecrs/parser.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/parser.c 2007-11-25 12:44:14 UTC (rev
5768)
+++ GNUnet/src/applications/fs/ecrs/parser.c 2007-11-25 13:00:36 UTC (rev
5769)
@@ -100,7 +100,7 @@
(0 == strncmp (typename, tmp, strlen (typename))))
{
GNUNET_ECRS_meta_data_insert (meta, type,
- &tmp[strlen (typename) + 1]);
+ &tmp[strlen (typename) + 1]);
GNUNET_free (tmp);
tmp = NULL;
break;
@@ -110,7 +110,7 @@
(0 == strncmp (typename_i18n, tmp, strlen (typename_i18n))))
{
GNUNET_ECRS_meta_data_insert (meta, type,
- &tmp[strlen (typename_i18n) + 1]);
+ &tmp[strlen (typename_i18n) + 1]);
GNUNET_free (tmp);
tmp = NULL;
break;
Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c 2007-11-25 12:44:14 UTC
(rev 5768)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c 2007-11-25 13:00:36 UTC
(rev 5769)
@@ -268,13 +268,13 @@
meta = GNUNET_ECRS_meta_data_create ();
kuri = GNUNET_ECRS_keyword_list_to_uri (ectx, 2, (const char **) keywords);
waitForEvent = GNUNET_FSUI_upload_completed;
- upload = GNUNET_FSUI_upload_star (ctx,
- fn,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, NULL, 0, 0,
- GNUNET_YES, GNUNET_NO, GNUNET_NO,
- GNUNET_get_time () +
- 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
+ upload = GNUNET_FSUI_upload_start (ctx,
+ fn,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, NULL, 0, 0,
+ GNUNET_YES, GNUNET_NO, GNUNET_NO,
+ GNUNET_get_time () +
+ 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
CHECK (upload != NULL);
GNUNET_ECRS_uri_destroy (kuri);
kuri = NULL;
Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c 2007-11-25 12:44:14 UTC (rev
5768)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c 2007-11-25 13:00:36 UTC (rev
5769)
@@ -153,13 +153,13 @@
"foo bar test!", strlen ("foo bar test!"), "600");
meta = GNUNET_ECRS_meta_data_create ();
kuri = GNUNET_ECRS_keyword_list_to_uri (NULL, 2, (const char **) keywords);
- upload = GNUNET_FSUI_upload_star (ctx, filename,
(GNUNET_FSUI_DirectoryScanCallback) & GNUNET_disk_directory_scan, NULL, 0, /*
anonymity */
- 0, /* priority */
- GNUNET_YES,
- GNUNET_NO,
- GNUNET_NO,
- GNUNET_get_time () +
- 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
+ upload = GNUNET_FSUI_upload_start (ctx, filename,
(GNUNET_FSUI_DirectoryScanCallback) & GNUNET_disk_directory_scan, NULL, 0, /*
anonymity */
+ 0, /* priority */
+ GNUNET_YES,
+ GNUNET_NO,
+ GNUNET_NO,
+ GNUNET_get_time () +
+ 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
CHECK (upload != NULL);
GNUNET_ECRS_uri_destroy (kuri);
GNUNET_ECRS_meta_data_destroy (meta);
Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c 2007-11-25 12:44:14 UTC
(rev 5768)
+++ GNUnet/src/applications/fs/fsui/searchtest.c 2007-11-25 13:00:36 UTC
(rev 5769)
@@ -174,13 +174,13 @@
kuri = GNUNET_ECRS_keyword_list_to_uri (NULL, 2, (const char **) keywords);
waitForEvent = GNUNET_FSUI_upload_completed;
upload =
- GNUNET_FSUI_upload_star (ctx,
- fn,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, NULL, 0, 0,
- GNUNET_YES, GNUNET_NO, GNUNET_NO,
- GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, meta,
- kuri, kuri);
+ GNUNET_FSUI_upload_start (ctx,
+ fn,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, NULL, 0, 0,
+ GNUNET_YES, GNUNET_NO, GNUNET_NO,
+ GNUNET_get_time () + 5 * GNUNET_CRON_HOURS,
+ meta, kuri, kuri);
CHECK (NULL != upload);
GNUNET_free (fn);
fn = NULL;
Modified: GNUnet/src/applications/fs/fsui/serializetest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest.c 2007-11-25 12:44:14 UTC
(rev 5768)
+++ GNUnet/src/applications/fs/fsui/serializetest.c 2007-11-25 13:00:36 UTC
(rev 5769)
@@ -196,13 +196,13 @@
meta = GNUNET_ECRS_meta_data_create ();
kuri = GNUNET_ECRS_keyword_list_to_uri (ectx, 2, (const char **) keywords);
waitForEvent = GNUNET_FSUI_upload_completed;
- upload = GNUNET_FSUI_upload_star (ctx,
- fn,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, NULL, 0, 0,
- GNUNET_YES, GNUNET_NO, GNUNET_NO,
- GNUNET_get_time () +
- 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
+ upload = GNUNET_FSUI_upload_start (ctx,
+ fn,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, NULL, 0, 0,
+ GNUNET_YES, GNUNET_NO, GNUNET_NO,
+ GNUNET_get_time () +
+ 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
CHECK (upload != NULL);
GNUNET_ECRS_uri_destroy (kuri);
kuri = NULL;
Modified: GNUnet/src/applications/fs/fsui/serializetest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest2.c 2007-11-25 12:44:14 UTC
(rev 5768)
+++ GNUnet/src/applications/fs/fsui/serializetest2.c 2007-11-25 13:00:36 UTC
(rev 5769)
@@ -378,14 +378,14 @@
meta = GNUNET_ECRS_meta_data_create ();
kuri = GNUNET_ECRS_keyword_list_to_uri (ectx, 2, (const char **) keywords);
GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_MIMETYPE,
- GNUNET_DIRECTORY_MIME);
+ GNUNET_DIRECTORY_MIME);
upload =
- GNUNET_FSUI_upload_star (ctx, UPLOAD_PREFIX,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, NULL, 0, 0,
- GNUNET_YES, GNUNET_NO, GNUNET_NO,
- GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, meta,
- kuri, kuri);
+ GNUNET_FSUI_upload_start (ctx, UPLOAD_PREFIX,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, NULL, 0, 0,
+ GNUNET_YES, GNUNET_NO, GNUNET_NO,
+ GNUNET_get_time () + 5 * GNUNET_CRON_HOURS,
+ meta, kuri, kuri);
CHECK (upload != NULL);
GNUNET_ECRS_uri_destroy (kuri);
kuri = NULL;
Modified: GNUnet/src/applications/fs/fsui/serializetest4.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest4.c 2007-11-25 12:44:14 UTC
(rev 5768)
+++ GNUnet/src/applications/fs/fsui/serializetest4.c 2007-11-25 13:00:36 UTC
(rev 5769)
@@ -346,14 +346,14 @@
meta = GNUNET_ECRS_meta_data_create ();
kuri = GNUNET_ECRS_keyword_list_to_uri (ectx, 2, (const char **) keywords);
GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_MIMETYPE,
- GNUNET_DIRECTORY_MIME);
+ GNUNET_DIRECTORY_MIME);
upload =
- GNUNET_FSUI_upload_star (ctx, UPLOAD_PREFIX,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, NULL, 0, 0,
- GNUNET_YES, GNUNET_NO, GNUNET_NO,
- GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, meta,
- kuri, kuri);
+ GNUNET_FSUI_upload_start (ctx, UPLOAD_PREFIX,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, NULL, 0, 0,
+ GNUNET_YES, GNUNET_NO, GNUNET_NO,
+ GNUNET_get_time () + 5 * GNUNET_CRON_HOURS,
+ meta, kuri, kuri);
CHECK (upload != NULL);
GNUNET_ECRS_uri_destroy (kuri);
kuri = NULL;
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2007-11-25 12:44:14 UTC (rev
5768)
+++ GNUnet/src/applications/fs/fsui/upload.c 2007-11-25 13:00:36 UTC (rev
5769)
@@ -639,7 +639,8 @@
}
utc->meta = GNUNET_ECRS_meta_data_duplicate (md);
GNUNET_ECRS_meta_data_insert (utc->meta,
- EXTRACTOR_MIMETYPE, GNUNET_DIRECTORY_MIME);
+ EXTRACTOR_MIMETYPE,
+ GNUNET_DIRECTORY_MIME);
}
if (keywords != NULL)
utc->keywords = GNUNET_ECRS_uri_duplicate (keywords);
@@ -696,19 +697,19 @@
* running
*/
struct GNUNET_FSUI_UploadList *
-GNUNET_FSUI_upload_star (struct GNUNET_FSUI_Context *ctx,
- const char *filename,
- GNUNET_FSUI_DirectoryScanCallback dsc,
- void *dscClosure,
- unsigned int anonymityLevel,
- unsigned int priority,
- int doIndex,
- int doExtract,
- int individualKeywords,
- GNUNET_CronTime expiration,
- const struct GNUNET_ECRS_MetaData *md,
- const struct GNUNET_ECRS_URI *globalURI,
- const struct GNUNET_ECRS_URI *keyUri)
+GNUNET_FSUI_upload_start (struct GNUNET_FSUI_Context *ctx,
+ const char *filename,
+ GNUNET_FSUI_DirectoryScanCallback dsc,
+ void *dscClosure,
+ unsigned int anonymityLevel,
+ unsigned int priority,
+ int doIndex,
+ int doExtract,
+ int individualKeywords,
+ GNUNET_CronTime expiration,
+ const struct GNUNET_ECRS_MetaData *md,
+ const struct GNUNET_ECRS_URI *globalURI,
+ const struct GNUNET_ECRS_URI *keyUri)
{
char *config;
EXTRACTOR_ExtractorList *extractors;
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2007-11-25 12:44:14 UTC
(rev 5768)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2007-11-25 13:00:36 UTC
(rev 5769)
@@ -497,14 +497,14 @@
GNUNET_ECRS_meta_data_add_publication_date (meta);
start_time = GNUNET_get_time ();
errorCode = 1;
- ul = GNUNET_FSUI_upload_star (ctx,
- tmp,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, ectx, anonymity,
- priority, !do_insert, GNUNET_YES,
- !do_no_direct_references,
- start_time + 2 * GNUNET_CRON_YEARS, meta,
- gloKeywords, topKeywords);
+ ul = GNUNET_FSUI_upload_start (ctx,
+ tmp,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, ectx, anonymity,
+ priority, !do_insert, GNUNET_YES,
+ !do_no_direct_references,
+ start_time + 2 * GNUNET_CRON_YEARS, meta,
+ gloKeywords, topKeywords);
if (gloKeywords != NULL)
GNUNET_ECRS_uri_destroy (gloKeywords);
if (topKeywords != NULL)
Modified: GNUnet/src/include/gnunet_ecrs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_ecrs_lib.h 2007-11-25 12:44:14 UTC (rev
5768)
+++ GNUnet/src/include/gnunet_ecrs_lib.h 2007-11-25 13:00:36 UTC (rev
5769)
@@ -129,8 +129,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if this entry already exists
*/
int GNUNET_ECRS_meta_data_insert (struct GNUNET_ECRS_MetaData *md,
- EXTRACTOR_KeywordType type,
- const char *data);
+ EXTRACTOR_KeywordType type,
+ const char *data);
/**
* Remove an item.
Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h 2007-11-25 12:44:14 UTC (rev
5768)
+++ GNUnet/src/include/gnunet_fsui_lib.h 2007-11-25 13:00:36 UTC (rev
5769)
@@ -928,30 +928,32 @@
* @param keyURI keywords for top-level file
* @return NULL on error
*/
-struct GNUNET_FSUI_UploadList *GNUNET_FSUI_upload_star (struct
- GNUNET_FSUI_Context
- *ctx,
- const char *filename,
-
GNUNET_FSUI_DirectoryScanCallback
- dsc, void *dscClosure,
- unsigned int
- anonymityLevel,
- unsigned int priority,
- int doIndex,
- int doExtract,
- int
- individualKeywords,
- GNUNET_CronTime
- expiration,
- const struct
- GNUNET_ECRS_MetaData
- *topLevelMetaData,
- const struct
- GNUNET_ECRS_URI
- *globalURI,
- const struct
- GNUNET_ECRS_URI
- *keyUri);
+struct GNUNET_FSUI_UploadList *GNUNET_FSUI_upload_start (struct
+ GNUNET_FSUI_Context
+ *ctx,
+ const char *filename,
+
GNUNET_FSUI_DirectoryScanCallback
+ dsc,
+ void *dscClosure,
+ unsigned int
+ anonymityLevel,
+ unsigned int
+ priority,
+ int doIndex,
+ int doExtract,
+ int
+ individualKeywords,
+ GNUNET_CronTime
+ expiration,
+ const struct
+ GNUNET_ECRS_MetaData
+ *topLevelMetaData,
+ const struct
+ GNUNET_ECRS_URI
+ *globalURI,
+ const struct
+ GNUNET_ECRS_URI
+ *keyUri);
/**
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5769 - in GNUnet/src: applications/fs/ecrs applications/fs/fsui applications/fs/tools include,
gnunet <=