Renamed retrieve_resource to retrieve_entry

diff --git a/backend/files/giochannel.c b/backend/files/giochannel.c
index 0cc9588..707b822 100644 (file)
--- a/backend/files/giochannel.c
+++ b/backend/files/giochannel.c
@@ -32,7 +32,7 @@ giochannel_iri_to_filename (AtomCtx *ctx, IRI *iri)
 }
 
 static AtomEntry *
-giochannel_atom_retrieve_resource (AtomCtx *ctx, IRI *iri)
+giochannel_atom_retrieve_entry (AtomCtx *ctx, IRI *iri)
 {
   gchar *filename;
   GIOChannel *channel;
@@ -71,7 +71,7 @@ giochannel_backend (void)
 {
   AtomBackend *backend;
   backend = atom_backend_new ();
-  atom_backend_retrieve_resource_set (backend,
-                                     giochannel_atom_retrieve_resource);
+  atom_backend_retrieve_entry_set (backend,
+                                  giochannel_atom_retrieve_entry);
   return backend;
 }

diff --git a/backend/gio/gio.c b/backend/gio/gio.c
index 042f6a8..a7366bf 100644 (file)
--- a/backend/gio/gio.c
+++ b/backend/gio/gio.c
@@ -55,7 +55,7 @@ gio_file_to_atom (AtomCtx *ctx, GFile *file)
 }
 
 static AtomEntry *
-gio_atom_retrieve_resource (AtomCtx *ctx, IRI *iri)
+gio_atom_retrieve_entry (AtomCtx *ctx, IRI *iri)
 {
   GFile *file;
   AtomEntry *atom;
@@ -106,7 +106,7 @@ gio_backend (void)
 {
   AtomBackend *backend;
   backend = atom_backend_new ();
-  atom_backend_retrieve_resource_set (backend, gio_atom_retrieve_resource);
+  atom_backend_retrieve_entry_set (backend, gio_atom_retrieve_entry);
   atom_backend_enumerate_entries_set (backend, gio_enumerate_entries);
   return backend;
 }

diff --git a/include/atompub/backend.h b/include/atompub/backend.h
index 9a84f2f..3a41899 100644 (file)
--- a/include/atompub/backend.h
+++ b/include/atompub/backend.h
@@ -29,11 +29,11 @@ typedef struct _atom_backend AtomBackend;
 
 AtomBackend *atom_backend_new (void);
 void atom_backend_delete (AtomBackend *);
-void atom_backend_retrieve_resource_set (AtomBackend *,
-                                        AtomEntry * (AtomCtx *, IRI *));
+void atom_backend_retrieve_entry_set (AtomBackend *,
+                                     AtomEntry * (AtomCtx *, IRI *));
 void atom_backend_enumerate_entries_set (AtomBackend *,
                                         void (AtomCtx *, AtomEntry ***, size_t *));
-AtomEntry * atom_retrieve_resource (AtomCtx *, IRI *);
+AtomEntry * atom_retrieve_entry (AtomCtx *, IRI *);
 void atom_enumerate_entries (AtomCtx *, AtomEntry ***, size_t *);
 AtomFeed * atom_retrieve_feed (AtomCtx *);
 AtomBackend * atom_backend (AtomCtx *);

diff --git a/src/backend.c b/src/backend.c
index 223fcee..d1ffec7 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -22,7 +22,7 @@
 
 struct _atom_backend
 {
-  AtomEntry * (*retrieve_resource) (AtomCtx *, IRI *);
+  AtomEntry * (*retrieve_entry) (AtomCtx *, IRI *);
   void (*enumerate_entries) (AtomCtx *, AtomEntry ***, size_t *);
 };
 
@@ -31,7 +31,7 @@ atom_backend_new ()
 {
   AtomBackend *backend;
   backend = g_slice_new (AtomBackend);
-  backend->retrieve_resource = NULL;
+  backend->retrieve_entry = NULL;
   backend->enumerate_entries = NULL;
   return backend;
 }
@@ -43,11 +43,11 @@ atom_backend_delete (AtomBackend *backend)
 }
 
 void
-atom_backend_retrieve_resource_set (AtomBackend *backend,
-                                   AtomEntry *retrieve_resource (AtomCtx *,
-                                                                 IRI *))
+atom_backend_retrieve_entry_set (AtomBackend *backend,
+                                AtomEntry *retrieve_entry (AtomCtx *,
+                                                           IRI *))
 {
-  backend->retrieve_resource = retrieve_resource;
+  backend->retrieve_entry = retrieve_entry;
 }
 
 void
@@ -59,12 +59,12 @@ atom_backend_enumerate_entries_set (AtomBackend *backend,
 }
 
 AtomEntry *
-atom_retrieve_resource (AtomCtx *ctx, IRI *iri)
+atom_retrieve_entry (AtomCtx *ctx, IRI *iri)
 {
   AtomBackend *backend;
   backend = atom_backend (ctx);
-  if (backend && backend->retrieve_resource)
-    return backend->retrieve_resource (ctx, iri);
+  if (backend && backend->retrieve_entry)
+    return backend->retrieve_entry (ctx, iri);
   return NULL;
 }