From 2436a4de603584646ecaf8ed889879c9f3928e0c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 28 May 2009 19:57:54 +0200 Subject: [PATCH] After review/feedback/discussions on the mailing list. Rename two functions: s/libssh2_knownhost_parsefile/libssh2_knownhost_readfile s/libssh2_knownhost_dumpfile/libssh2_knownhost_writefile --- docs/Makefile.am | 4 ++-- docs/libssh2_knownhost_get.3 | 4 ++-- ...host_parsefile.3 => libssh2_knownhost_readfile.3} | 8 ++++---- ...host_dumpfile.3 => libssh2_knownhost_writefile.3} | 10 +++++----- example/simple/ssh2_exec.c | 4 ++-- include/libssh2.h | 12 ++++++------ src/knownhost.c | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) rename docs/{libssh2_knownhost_parsefile.3 => libssh2_knownhost_readfile.3} (72%) rename docs/{libssh2_knownhost_dumpfile.3 => libssh2_knownhost_writefile.3} (64%) diff --git a/docs/Makefile.am b/docs/Makefile.am index c18f73f..e6e8999 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -38,10 +38,10 @@ dist_man_MANS = \ libssh2_knownhost_add.3 \ libssh2_knownhost_check.3 \ libssh2_knownhost_del.3 \ - libssh2_knownhost_dumpfile.3 \ libssh2_knownhost_get.3 \ libssh2_knownhost_init.3 \ - libssh2_knownhost_parsefile.3 \ + libssh2_knownhost_readfile.3 \ + libssh2_knownhost_writefile.3 \ libssh2_new_host_entry.3 \ libssh2_poll.3 \ libssh2_poll_channel_read.3 \ diff --git a/docs/libssh2_knownhost_get.3 b/docs/libssh2_knownhost_get.3 index 466ee7b..90b8c09 100644 --- a/docs/libssh2_knownhost_get.3 +++ b/docs/libssh2_knownhost_get.3 @@ -30,6 +30,6 @@ Returns negative values for error .SH AVAILABILITY Added in libssh2 1.2 .SH SEE ALSO -.BR libssh2_knownhost_parsefile(3) -.BR libssh2_knownhost_dumpfile(3) +.BR libssh2_knownhost_readfile(3) +.BR libssh2_knownhost_writefile(3) .BR libssh2_knownhost_add(3) diff --git a/docs/libssh2_knownhost_parsefile.3 b/docs/libssh2_knownhost_readfile.3 similarity index 72% rename from docs/libssh2_knownhost_parsefile.3 rename to docs/libssh2_knownhost_readfile.3 index 96293d9..e0a7d12 100644 --- a/docs/libssh2_knownhost_parsefile.3 +++ b/docs/libssh2_knownhost_readfile.3 @@ -1,14 +1,14 @@ .\" .\" Copyright (c) 2009 by Daniel Stenberg .\" -.TH libssh2_knownhost_parsefile 3 "28 May 2009" "libssh2 1.2" "libssh2 manual" +.TH libssh2_knownhost_readfile 3 "28 May 2009" "libssh2 1.2" "libssh2 manual" .SH NAME -libssh2_knownhost_parsefile - parse a file of known hosts +libssh2_knownhost_readfile - parse a file of known hosts .SH SYNOPSIS #include -int libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts, - const char *filename, int type); +int libssh2_knownhost_readfile(LIBSSH2_KNOWNHOSTS *hosts, + const char *filename, int type); .SH DESCRIPTION Reads a collection of known hosts from a specified file and adds them to the collection of known hosts. diff --git a/docs/libssh2_knownhost_dumpfile.3 b/docs/libssh2_knownhost_writefile.3 similarity index 64% rename from docs/libssh2_knownhost_dumpfile.3 rename to docs/libssh2_knownhost_writefile.3 index 8ef1bd6..48335a0 100644 --- a/docs/libssh2_knownhost_dumpfile.3 +++ b/docs/libssh2_knownhost_writefile.3 @@ -1,14 +1,14 @@ .\" .\" Copyright (c) 2009 by Daniel Stenberg .\" -.TH libssh2_knownhost_dumpfile 3 "28 May 2009" "libssh2 1.2" "libssh2 manual" +.TH libssh2_knownhost_writefile 3 "28 May 2009" "libssh2 1.2" "libssh2 manual" .SH NAME -libssh2_knownhost_dumpfile - write a collection of known hosts to a file +libssh2_knownhost_writefile - write a collection of known hosts to a file .SH SYNOPSIS #include -int libssh2_knownhost_dumpfile(LIBSSH2_KNOWNHOSTS *hosts, - const char *filename, int type); +int libssh2_knownhost_writefile(LIBSSH2_KNOWNHOSTS *hosts, + const char *filename, int type); .SH DESCRIPTION Writes all the known hosts to the specified file using the specified file format. @@ -24,6 +24,6 @@ and 0 indicates success. .SH AVAILABILITY Added in libssh2 1.2 .SH SEE ALSO -.BR libssh2_knownhost_parsefile(3) +.BR libssh2_knownhost_readfile(3) .BR libssh2_knownhost_add(3) diff --git a/example/simple/ssh2_exec.c b/example/simple/ssh2_exec.c index 9584c3c..64ca644 100644 --- a/example/simple/ssh2_exec.c +++ b/example/simple/ssh2_exec.c @@ -133,8 +133,8 @@ int main(int argc, char *argv[]) return 2; } - libssh2_knownhost_parsefile(nh, "known_hosts", - LIBSSH2_KNOWNHOST_FILE_OPENSSH); + libssh2_knownhost_readfile(nh, "known_hosts", + LIBSSH2_KNOWNHOST_FILE_OPENSSH); fingerprint = libssh2_session_hostkey(session, &len); if(fingerprint) { diff --git a/include/libssh2.h b/include/libssh2.h index 26cc944..1301bda 100644 --- a/include/libssh2.h +++ b/include/libssh2.h @@ -778,7 +778,7 @@ LIBSSH2_API void libssh2_knownhost_free(LIBSSH2_KNOWNHOSTS *hosts); /* - * libssh2_knownhost_parsefile + * libssh2_knownhost_readfile * * Add hosts+key pairs from a given file. * @@ -791,11 +791,11 @@ libssh2_knownhost_free(LIBSSH2_KNOWNHOSTS *hosts); #define LIBSSH2_KNOWNHOST_FILE_OPENSSH 1 LIBSSH2_API int -libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts, - const char *filename, int type); +libssh2_knownhost_readfile(LIBSSH2_KNOWNHOSTS *hosts, + const char *filename, int type); /* - * libssh2_knownhost_dumpfile + * libssh2_knownhost_writefile * * Write hosts+key pairs to a given file. * @@ -804,8 +804,8 @@ libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts, */ LIBSSH2_API int -libssh2_knownhost_dumpfile(LIBSSH2_KNOWNHOSTS *hosts, - const char *filename, int type); +libssh2_knownhost_writefile(LIBSSH2_KNOWNHOSTS *hosts, + const char *filename, int type); /* * libssh2_knownhost_get() diff --git a/src/knownhost.c b/src/knownhost.c index 37cddd2..cc30108 100644 --- a/src/knownhost.c +++ b/src/knownhost.c @@ -459,9 +459,9 @@ static int hostline(LIBSSH2_KNOWNHOSTS *hosts, } /* - * libssh2_knownhost_parsefile + * libssh2_knownhost_readfile * - * Add hosts+key pairs from a given file. + * Read hosts+key pairs from a given file. * * Returns a negative value for error or number of successfully added hosts. * @@ -490,8 +490,8 @@ static int hostline(LIBSSH2_KNOWNHOSTS *hosts, #define LIBSSH2_KNOWNHOST_FILE_OPENSSH 1 LIBSSH2_API int -libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts, - const char *filename, int type) +libssh2_knownhost_readfile(LIBSSH2_KNOWNHOSTS *hosts, + const char *filename, int type) { FILE *file; int num = 0; @@ -558,12 +558,12 @@ libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts, } /* - * libssh2_knownhost_dumpfile() + * libssh2_knownhost_writefile() * * Write hosts+key pairs to the given file. */ LIBSSH2_API int -libssh2_knownhost_dumpfile(LIBSSH2_KNOWNHOSTS *hosts, +libssh2_knownhost_writefile(LIBSSH2_KNOWNHOSTS *hosts, const char *filename, int type) { struct known_host *node;