[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7041 - gnunet-fuse
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7041 - gnunet-fuse |
Date: |
Tue, 3 Jun 2008 23:53:36 -0600 (MDT) |
Author: grothoff
Date: 2008-06-03 23:53:36 -0600 (Tue, 03 Jun 2008)
New Revision: 7041
Modified:
gnunet-fuse/directory.c
gnunet-fuse/dirent.c
gnunet-fuse/gnfs.h
gnunet-fuse/mkdir.c
gnunet-fuse/mknod.c
Log:
renaming to match API change
Modified: gnunet-fuse/directory.c
===================================================================
--- gnunet-fuse/directory.c 2008-06-04 03:21:34 UTC (rev 7040)
+++ gnunet-fuse/directory.c 2008-06-04 05:53:36 UTC (rev 7041)
@@ -60,7 +60,7 @@
return GNUNET_OK;
/* Figure out the filename and type from metadata */
- filename = GNUNET_ECRS_meta_data_get_by_type(fi->meta,
EXTRACTOR_FILENAME);
+ filename = GNUNET_meta_data_get_by_type(fi->meta, EXTRACTOR_FILENAME);
if(filename == NULL)
{
GNUNET_GE_LOG(ectx, GNUNET_GE_BULK | GNUNET_GE_USER |
GNUNET_GE_WARNING,
@@ -68,7 +68,7 @@
return GNUNET_OK;
}
len = strlen(filename);
- if(GNUNET_ECRS_meta_data_test_for_directory(fi->meta) == GNUNET_YES)
+ if(GNUNET_meta_data_test_for_directory(fi->meta) == GNUNET_YES)
{
if(filename[len - 1] == '/' || filename[len - 1] == '\\')
filename[len - 1] = '\0';
@@ -116,7 +116,7 @@
static int directory_cache_locked(struct dirent *de)
{
- struct GNUNET_ECRS_MetaData *md;
+ struct GNUNET_MetaData *md;
void *mem;
int ret;
guint64 len;
@@ -138,7 +138,7 @@
(GDestroyNotify)gn_dirent_put);
GNUNET_ECRS_directory_list_contents(ectx, mem, len, &md, dir_cache_cb,
de);
GNUNET_free(mem);
- GNUNET_ECRS_meta_data_destroy(md);
+ GNUNET_meta_data_destroy(md);
de->de_cached = 1;
GNUNET_GE_LOG(ectx, GNUNET_GE_BULK | GNUNET_GE_DEVELOPER |
GNUNET_GE_DEBUG,
"%s: cached %d entries\n", __FUNCTION__,
@@ -343,7 +343,7 @@
}
}
d->fis[d->count].uri = GNUNET_ECRS_uri_duplicate(de->de_fi.uri);
- d->fis[d->count].meta = GNUNET_ECRS_meta_data_duplicate(de->de_fi.meta);
+ d->fis[d->count].meta = GNUNET_meta_data_duplicate(de->de_fi.meta);
d->count++;
out:
GNUNET_semaphore_up(de->de_sema);
@@ -383,7 +383,7 @@
for(i = 0; i < d.count; i++)
{
GNUNET_ECRS_uri_destroy(d.fis[i].uri);
- GNUNET_ECRS_meta_data_destroy(d.fis[i].meta);
+ GNUNET_meta_data_destroy(d.fis[i].meta);
}
GNUNET_free(d.fis);
if(ret == GNUNET_SYSERR)
Modified: gnunet-fuse/dirent.c
===================================================================
--- gnunet-fuse/dirent.c 2008-06-04 03:21:34 UTC (rev 7040)
+++ gnunet-fuse/dirent.c 2008-06-04 05:53:36 UTC (rev 7041)
@@ -73,7 +73,7 @@
if(de->de_fi.uri != NULL)
GNUNET_ECRS_uri_destroy(de->de_fi.uri);
if(de->de_fi.meta != NULL)
- GNUNET_ECRS_meta_data_destroy(de->de_fi.meta);
+ GNUNET_meta_data_destroy(de->de_fi.meta);
if(de->de_type == DE_DIR)
{
if(de->de_cached)
@@ -126,7 +126,7 @@
* Create a new dirent with a reference, path and uri are copied
*/
struct dirent *gn_dirent_new(const gchar *path, struct GNUNET_ECRS_URI *uri,
- struct GNUNET_ECRS_MetaData *meta, gchar type)
+ struct GNUNET_MetaData *meta, gchar type)
{
struct dirent *de;
@@ -163,9 +163,9 @@
}
}
if(meta == NULL)
- de->de_fi.meta = GNUNET_ECRS_meta_data_create();
+ de->de_fi.meta = GNUNET_meta_data_create();
else
- de->de_fi.meta = GNUNET_ECRS_meta_data_duplicate(meta);
+ de->de_fi.meta = GNUNET_meta_data_duplicate(meta);
return de;
}
Modified: gnunet-fuse/gnfs.h
===================================================================
--- gnunet-fuse/gnfs.h 2008-06-04 03:21:34 UTC (rev 7040)
+++ gnunet-fuse/gnfs.h 2008-06-04 05:53:36 UTC (rev 7041)
@@ -85,7 +85,7 @@
/* dirent.c */
struct dirent *gn_dirent_new(const gchar *path, struct GNUNET_ECRS_URI *uri,
- struct GNUNET_ECRS_MetaData *meta, gchar type);
+ struct GNUNET_MetaData *meta, gchar type);
struct dirent *gn_dirent_get(const gchar *path);
void gn_dirent_ref(struct dirent *de);
void gn_dirent_put(struct dirent *de);
Modified: gnunet-fuse/mkdir.c
===================================================================
--- gnunet-fuse/mkdir.c 2008-06-04 03:21:34 UTC (rev 7040)
+++ gnunet-fuse/mkdir.c 2008-06-04 05:53:36 UTC (rev 7041)
@@ -28,7 +28,7 @@
int gn_mkdir(const char *path, mode_t mode)
{
struct dirent *de, *newde;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
char *parent, *file;
int ret;
@@ -56,11 +56,11 @@
GNUNET_free(parent);
return -ENOENT;
}
- meta = GNUNET_ECRS_meta_data_create();
- GNUNET_ECRS_meta_data_insert(meta, EXTRACTOR_FILENAME, file);
- GNUNET_ECRS_meta_data_insert(meta, EXTRACTOR_MIMETYPE,
GNUNET_DIRECTORY_MIME);
+ meta = GNUNET_meta_data_create();
+ GNUNET_meta_data_insert(meta, EXTRACTOR_FILENAME, file);
+ GNUNET_meta_data_insert(meta, EXTRACTOR_MIMETYPE,
GNUNET_DIRECTORY_MIME);
newde = gn_dirent_new(path, NULL, meta, DE_DIR);
- GNUNET_ECRS_meta_data_destroy(meta);
+ GNUNET_meta_data_destroy(meta);
ret = gn_directory_insert(de, newde);
gn_dirent_put(de);
gn_dirent_put(newde);
Modified: gnunet-fuse/mknod.c
===================================================================
--- gnunet-fuse/mknod.c 2008-06-04 03:21:34 UTC (rev 7040)
+++ gnunet-fuse/mknod.c 2008-06-04 05:53:36 UTC (rev 7041)
@@ -29,7 +29,7 @@
{
struct dirent *de, *newde;
struct GNUNET_ECRS_URI *uri;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
char *parent, *file;
int ret;
@@ -62,11 +62,11 @@
return -ENOENT;
}
uri = GNUNET_ECRS_string_to_uri(ectx, GN_EMPTY_FILE_URI);
- meta = GNUNET_ECRS_meta_data_create();
- GNUNET_ECRS_meta_data_insert(meta, EXTRACTOR_FILENAME, file);
+ meta = GNUNET_meta_data_create();
+ GNUNET_meta_data_insert(meta, EXTRACTOR_FILENAME, file);
GNUNET_free(parent);
newde = gn_dirent_new(path, uri, meta, DE_FILE);
- GNUNET_ECRS_meta_data_destroy(meta);
+ GNUNET_meta_data_destroy(meta);
GNUNET_ECRS_uri_destroy(uri);
ret = gn_directory_insert(de, newde);
gn_dirent_put(de);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7041 - gnunet-fuse,
gnunet <=