From 06e2dad14c677c166789509c07827eaab6e5bb5d Mon Sep 17 00:00:00 2001 From: oetiker Date: Mon, 9 Jun 2008 15:49:54 +0000 Subject: [PATCH] add all lowlevel file access functions from the rrd_open interface to the export list. git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1420 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/src/librrd.sym | 16 +++++++++++----- program/src/rrd.h | 37 +++++++++++++++++++++++++++++++++++++ program/src/rrd_tool.h | 35 ----------------------------------- 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/program/src/librrd.sym b/program/src/librrd.sym index aa5320f2..a1822c9d 100644 --- a/program/src/librrd.sym +++ b/program/src/librrd.sym @@ -1,12 +1,16 @@ rrd_clear_error +rrd_close rrd_create rrd_create_r +rrd_dontneed rrd_dump rrd_dump_r rrd_fetch rrd_fetch_r rrd_first rrd_first_r +rrd_flush +rrd_free rrd_free_context rrd_freemem rrd_get_context @@ -17,28 +21,30 @@ rrd_info rrd_info_free rrd_info_print rrd_info_push +rrd_init rrd_last rrd_last_r rrd_lastupdate +rrd_lock rrd_new_context +rrd_open rrd_parsetime rrd_proc_start_end +rrd_read rrd_resize rrd_restore +rrd_seek rrd_set_error rrd_set_to_DINF rrd_set_to_DNAN rrd_strerror rrd_strversion +rrd_tell rrd_test_error rrd_tune rrd_update rrd_update_r rrd_update_v rrd_version -rrd_xport -rrd_open -rrd_read -rrd_close -rrd_tell rrd_write +rrd_xport diff --git a/program/src/rrd.h b/program/src/rrd.h index dc1569e9..e705c5fe 100644 --- a/program/src/rrd.h +++ b/program/src/rrd.h @@ -199,6 +199,9 @@ extern "C" { char ***, rrd_value_t **); + void rrd_freemem( + void *mem); + /* thread-safe (hopefully) */ int rrd_create_r( const char *filename, @@ -296,6 +299,40 @@ extern "C" { /* int rrd_test_error_r (rrd_context_t *); */ /* char *rrd_get_error_r (rrd_context_t *); */ +/* low level file access */ + void rrd_init( + rrd_t *rrd); + void rrd_free( + rrd_t *rrd); + + rrd_file_t *rrd_open( + const char *const file_name, + rrd_t *rrd, + unsigned rdwr); + void rrd_dontneed( + rrd_file_t *rrd_file, + rrd_t *rrd); + int rrd_close( + rrd_file_t *rrd_file); + ssize_t rrd_read( + rrd_file_t *rrd_file, + void *buf, + size_t count); + ssize_t rrd_write( + rrd_file_t *rrd_file, + const void *buf, + size_t count); + void rrd_flush( + rrd_file_t *rrd_file); + off_t rrd_seek( + rrd_file_t *rrd_file, + off_t off, + int whence); + off_t rrd_tell( + rrd_file_t *rrd_file); + int rrd_lock( + rrd_file_t *file); + #endif /* _RRDLIB_H */ #ifdef __cplusplus diff --git a/program/src/rrd_tool.h b/program/src/rrd_tool.h index a8a01fac..e211c6bf 100644 --- a/program/src/rrd_tool.h +++ b/program/src/rrd_tool.h @@ -87,41 +87,6 @@ extern "C" { char ***ds_namv, rrd_value_t **data); - void rrd_free( - rrd_t *rrd); - void rrd_freemem( - void *mem); - void rrd_init( - rrd_t *rrd); - - rrd_file_t *rrd_open( - const char *const file_name, - rrd_t *rrd, - unsigned rdwr); - void rrd_dontneed( - rrd_file_t *rrd_file, - rrd_t *rrd); - int rrd_close( - rrd_file_t *rrd_file); - ssize_t rrd_read( - rrd_file_t *rrd_file, - void *buf, - size_t count); - ssize_t rrd_write( - rrd_file_t *rrd_file, - const void *buf, - size_t count); - void rrd_flush( - rrd_file_t *rrd_file); - off_t rrd_seek( - rrd_file_t *rrd_file, - off_t off, - int whence); - off_t rrd_tell( - rrd_file_t *rrd_file); - int rrd_lock( - rrd_file_t *file); - #define RRD_READONLY (1<<0) #define RRD_READWRITE (1<<1) #define RRD_CREAT (1<<2) -- 2.30.2