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

After review/feedback/discussions on the mailing list. Rename two functions:

Browse Source 
s/libssh2_knownhost_parsefile/libssh2_knownhost_readfile
s/libssh2_knownhost_dumpfile/libssh2_knownhost_writefile
This commit is contained in:
Daniel Stenberg 2009-05-28 19:57:54 +02:00
parent 22014f074b
commit 2436a4de60
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/Makefile.am
View File

@ -38,10 +38,10 @@ dist_man_MANS = \
libssh2_knownhost_add.3 \ libssh2_knownhost_add.3 \
libssh2_knownhost_check.3 \ libssh2_knownhost_check.3 \
libssh2_knownhost_del.3 \ libssh2_knownhost_del.3 \
libssh2_knownhost_dumpfile.3 \
libssh2_knownhost_get.3 \ libssh2_knownhost_get.3 \
libssh2_knownhost_init.3 \ libssh2_knownhost_init.3 \
libssh2_knownhost_parsefile.3 \ libssh2_knownhost_readfile.3 \
libssh2_knownhost_writefile.3 \
libssh2_new_host_entry.3 \ libssh2_new_host_entry.3 \
libssh2_poll.3 \ libssh2_poll.3 \
libssh2_poll_channel_read.3 \ libssh2_poll_channel_read.3 \

4
docs/libssh2_knownhost_get.3
View File

@ -30,6 +30,6 @@ Returns negative values for error
.SH AVAILABILITY .SH AVAILABILITY
Added in libssh2 1.2 Added in libssh2 1.2
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_knownhost_parsefile(3) .BR libssh2_knownhost_readfile(3)
.BR libssh2_knownhost_dumpfile(3) .BR libssh2_knownhost_writefile(3)
.BR libssh2_knownhost_add(3) .BR libssh2_knownhost_add(3)

8
docs/libssh2_knownhost_parsefile.3 → docs/libssh2_knownhost_readfile.3
View File

@ -1,14 +1,14 @@
.\" .\"
.\" Copyright (c) 2009 by Daniel Stenberg .\" 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 .SH NAME
libssh2_knownhost_parsefile - parse a file of known hosts libssh2_knownhost_readfile - parse a file of known hosts
.SH SYNOPSIS .SH SYNOPSIS
#include <libssh2.h> #include <libssh2.h>
int libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts, int libssh2_knownhost_readfile(LIBSSH2_KNOWNHOSTS *hosts,
const char *filename, int type); const char *filename, int type);
.SH DESCRIPTION .SH DESCRIPTION
Reads a collection of known hosts from a specified file and adds them to the Reads a collection of known hosts from a specified file and adds them to the
collection of known hosts. collection of known hosts.

10
docs/libssh2_knownhost_dumpfile.3 → docs/libssh2_knownhost_writefile.3
View File

@ -1,14 +1,14 @@
.\" .\"
.\" Copyright (c) 2009 by Daniel Stenberg .\" 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 .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 .SH SYNOPSIS
#include <libssh2.h> #include <libssh2.h>
int libssh2_knownhost_dumpfile(LIBSSH2_KNOWNHOSTS *hosts, int libssh2_knownhost_writefile(LIBSSH2_KNOWNHOSTS *hosts,
const char *filename, int type); const char *filename, int type);
.SH DESCRIPTION .SH DESCRIPTION
Writes all the known hosts to the specified file using the specified file Writes all the known hosts to the specified file using the specified file
format. format.
@ -24,6 +24,6 @@ and 0 indicates success.
.SH AVAILABILITY .SH AVAILABILITY
Added in libssh2 1.2 Added in libssh2 1.2
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_knownhost_parsefile(3) .BR libssh2_knownhost_readfile(3)
.BR libssh2_knownhost_add(3) .BR libssh2_knownhost_add(3)

4
example/simple/ssh2_exec.c
View File

@ -133,8 +133,8 @@ int main(int argc, char *argv[])
return 2; return 2;
} }
libssh2_knownhost_parsefile(nh, "known_hosts", libssh2_knownhost_readfile(nh, "known_hosts",
LIBSSH2_KNOWNHOST_FILE_OPENSSH); LIBSSH2_KNOWNHOST_FILE_OPENSSH);
fingerprint = libssh2_session_hostkey(session, &len); fingerprint = libssh2_session_hostkey(session, &len);
if(fingerprint) { if(fingerprint) {

12
include/libssh2.h
View File

@ -778,7 +778,7 @@ LIBSSH2_API void
libssh2_knownhost_free(LIBSSH2_KNOWNHOSTS *hosts); libssh2_knownhost_free(LIBSSH2_KNOWNHOSTS *hosts);
/* /*
* libssh2_knownhost_parsefile * libssh2_knownhost_readfile
* *
* Add hosts+key pairs from a given file. * Add hosts+key pairs from a given file.
* *
@ -791,11 +791,11 @@ libssh2_knownhost_free(LIBSSH2_KNOWNHOSTS *hosts);
#define LIBSSH2_KNOWNHOST_FILE_OPENSSH 1 #define LIBSSH2_KNOWNHOST_FILE_OPENSSH 1
LIBSSH2_API int LIBSSH2_API int
libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts, libssh2_knownhost_readfile(LIBSSH2_KNOWNHOSTS *hosts,
const char *filename, int type); const char *filename, int type);
/* /*
* libssh2_knownhost_dumpfile * libssh2_knownhost_writefile
* *
* Write hosts+key pairs to a given file. * Write hosts+key pairs to a given file.
* *
@ -804,8 +804,8 @@ libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts,
*/ */
LIBSSH2_API int LIBSSH2_API int
libssh2_knownhost_dumpfile(LIBSSH2_KNOWNHOSTS *hosts, libssh2_knownhost_writefile(LIBSSH2_KNOWNHOSTS *hosts,
const char *filename, int type); const char *filename, int type);
/* /*
* libssh2_knownhost_get() * libssh2_knownhost_get()

12
src/knownhost.c
View File

@ -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. * 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 #define LIBSSH2_KNOWNHOST_FILE_OPENSSH 1
LIBSSH2_API int LIBSSH2_API int
libssh2_knownhost_parsefile(LIBSSH2_KNOWNHOSTS *hosts, libssh2_knownhost_readfile(LIBSSH2_KNOWNHOSTS *hosts,
const char *filename, int type) const char *filename, int type)
{ {
FILE *file; FILE *file;
int num = 0; 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. * Write hosts+key pairs to the given file.
*/ */
LIBSSH2_API int LIBSSH2_API int
libssh2_knownhost_dumpfile(LIBSSH2_KNOWNHOSTS *hosts, libssh2_knownhost_writefile(LIBSSH2_KNOWNHOSTS *hosts,
const char *filename, int type) const char *filename, int type)
{ {
struct known_host *node; struct known_host *node;