[asterisk-commits] ivaxer: branch ivaxer/ast_storage r273887 - /team/ivaxer/ast_storage/include/...

[SVN commits to the Asterisk project]

Author: ivaxer
Date: Mon Jul  5 08:55:12 2010
New Revision: 273887

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273887
Log:
minor design fixes
- added path field to ast_storage structure
- fixed the prototype of the read/write functions (return type must be ssize_t)
- renamed localpath field in the ast_storage_fileinst structure to localfile

Modified:
    team/ivaxer/ast_storage/include/asterisk/storage.h

Modified: team/ivaxer/ast_storage/include/asterisk/storage.h
URL: http://svnview.digium.com/svn/asterisk/team/ivaxer/ast_storage/include/asterisk/storage.h?view=diff&rev=273887&r1=273886&r2=273887
==============================================================================
--- team/ivaxer/ast_storage/include/asterisk/storage.h (original)
+++ team/ivaxer/ast_storage/include/asterisk/storage.h Mon Jul  5 08:55:12 2010
@@ -34,7 +34,7 @@
 struct ast_storage_fileinst {
 	int fd;
 	AST_RWLIST_ENTRY(ast_storage_fileinst) list;
-	char localpath[1];
+	char localfile[1];
 };
 
 struct ast_storage_fileobject {
@@ -55,8 +55,8 @@
 	struct ast_storage_fileobject *(*get)(struct ast_storage *st, const char *objectname, const char *exts);
 	int (*put)(struct ast_storage *st, struct ast_storage_fileobject *fo);
 	int (*del)(struct ast_storage *st, struct ast_storage_fileobject *fo);
-	size_t (*read)(struct ast_storage *st, struct ast_storage_fileinst *fi, void *buf, size_t count);
-	size_t (*write)(struct ast_storage *st, struct ast_storage_fileinst *fi, void *buf, size_t count);
+	ssize_t (*read)(struct ast_storage *st, struct ast_storage_fileinst *fi, void *buf, size_t count);
+	ssize_t (*write)(struct ast_storage *st, struct ast_storage_fileinst *fi, void *buf, size_t count);
 	struct ast_storage_dirobject *(*listdir)(struct ast_storage *st, const char *objectpath);
 	unsigned long (*tell)(struct ast_storage *st, struct ast_storage_fileinst *fi);
 	int (*seek)(struct ast_storage *st, struct ast_storage_fileinst *fi);
@@ -69,6 +69,7 @@
 struct ast_storage {
 	const struct ast_storage_be *be;
 	void *storage_pvt; /* Backend specific structure */
+	char path[1];
 };
 
 int __ast_register_storage(const struct ast_storage_be *e, struct ast_module *mod);