generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

statvfs: use libssh2_sftp_statvfs only, no "_ex"

Browse Source 
As the long-term goal is to get rid of the extensive set of
macros from the API we can just as well start small by not adding
new macros when we add new functions. Therefore we let the
function be libssh2_sftp_statvfs() plainly without using an _ex
suffix.

I also made it use size_t instead of unsigned int for the string
length as that too is a long-term goal for the API.
This commit is contained in:
Daniel Stenberg 2010-05-28 17:21:39 +02:00
parent 8145f9e79c
commit d15663477b
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Makefile.am
View File

@ -138,7 +138,6 @@ dist_man_MANS = \
libssh2_sftp_stat.3 \
libssh2_sftp_stat_ex.3 \
libssh2_sftp_statvfs.3 \
libssh2_sftp_statvfs_ex.3 \
libssh2_sftp_symlink.3 \
libssh2_sftp_symlink_ex.3 \
libssh2_sftp_tell.3 \

6
docs/libssh2_sftp_statvfs.3
View File

@ -7,10 +7,8 @@ libssh2_sftp_statvfs, libssh2_sftp_fstatvfs - get file system statistics
#include <libssh2_sftp.h>
int
libssh2_sftp_statvfs_ex(LIBSSH2_SFTP *sftp, const char *path,
unsigned int path_len, LIBSSH2_SFTP_STATVFS *st);
#define libssh2_sftp_statvfs(sftp, path, st) \\
libssh2_sftp_statvfs_ex((sftp), (path), strlen(path), (st))
libssh2_sftp_statvfs(LIBSSH2_SFTP *sftp, const char *path,
size_t path_len, LIBSSH2_SFTP_STATVFS *st);
int
libssh2_sftp_fstatvfs(LIBSSH2_SFTP_HANDLE *handle,

1
docs/libssh2_sftp_statvfs_ex.3
View File

@ -1 +0,0 @@
.so man3/libssh2_sftp_statvfs.3

10
include/libssh2_sftp.h
View File

@ -291,12 +291,10 @@ LIBSSH2_API int libssh2_sftp_unlink_ex(LIBSSH2_SFTP *sftp,
LIBSSH2_API int libssh2_sftp_fstatvfs(LIBSSH2_SFTP_HANDLE *handle,
LIBSSH2_SFTP_STATVFS *st);
LIBSSH2_API int libssh2_sftp_statvfs_ex(LIBSSH2_SFTP *sftp,
const char *path,
unsigned int path_len,
LIBSSH2_SFTP_STATVFS *st);
#define libssh2_sftp_statvfs(sftp, path, st) \
libssh2_sftp_statvfs_ex((sftp), (path), strlen(path), (st))
LIBSSH2_API int libssh2_sftp_statvfs(LIBSSH2_SFTP *sftp,
const char *path,
size_t path_len,
LIBSSH2_SFTP_STATVFS *st);
LIBSSH2_API int libssh2_sftp_mkdir_ex(LIBSSH2_SFTP *sftp,
const char *path,

6
src/sftp.c
View File

@ -2161,12 +2161,12 @@ static int sftp_statvfs(LIBSSH2_SFTP *sftp, const char *path,
* support on the server)
*/
LIBSSH2_API int
libssh2_sftp_statvfs_ex(LIBSSH2_SFTP *sftp, const char *path,
unsigned int path_len, LIBSSH2_SFTP_STATVFS *st)
libssh2_sftp_statvfs(LIBSSH2_SFTP *sftp, const char *path,
size_t path_len, LIBSSH2_SFTP_STATVFS *st)
{
int rc;
BLOCK_ADJUST(rc, sftp->channel->session, sftp_statvfs(sftp, path, path_len,
st));
st));
return rc;
}