aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabiano FidĂȘncio <fidencio@redhat.com>2015-09-17 10:09:06 +0200
committerFabiano FidĂȘncio <fidencio@redhat.com>2016-01-19 11:31:07 +0100
commit501faacf8ec6fe75b032fa7bfabff82a83b0555e (patch)
treeae4e78b569544eb1c2fa36586ddb2e6c72e7e137
parentadc8c20ac17b39e32e6ac9e8913ebeeb1c5b8081 (diff)
downloadlibssh-501faacf8ec6fe75b032fa7bfabff82a83b0555e.tar.gz
libssh-501faacf8ec6fe75b032fa7bfabff82a83b0555e.tar.xz
libssh-501faacf8ec6fe75b032fa7bfabff82a83b0555e.zip
cleanup: use ssh_ prefix in the channels (non-static) functions
Having "ssh_" prefix in the functions' name will avoid possible clashes when compiling libssh statically. Signed-off-by: Fabiano FidĂȘncio <fidencio@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--include/libssh/channels.h12
-rw-r--r--src/channels.c12
-rw-r--r--src/channels1.c12
3 files changed, 18 insertions, 18 deletions
diff --git a/include/libssh/channels.h b/include/libssh/channels.h
index b05c4c02..44258bad 100644
--- a/include/libssh/channels.h
+++ b/include/libssh/channels.h
@@ -105,13 +105,13 @@ SSH_PACKET_CALLBACK(ssh_packet_close1);
SSH_PACKET_CALLBACK(ssh_packet_exist_status1);
/* channels1.c */
-int channel_open_session1(ssh_channel channel);
-int channel_request_pty_size1(ssh_channel channel, const char *terminal,
+int ssh_channel_open_session1(ssh_channel channel);
+int ssh_channel_request_pty_size1(ssh_channel channel, const char *terminal,
int cols, int rows);
-int channel_change_pty_size1(ssh_channel channel, int cols, int rows);
-int channel_request_shell1(ssh_channel channel);
-int channel_request_exec1(ssh_channel channel, const char *cmd);
-int channel_write1(ssh_channel channel, const void *data, int len);
+int ssh_channel_change_pty_size1(ssh_channel channel, int cols, int rows);
+int ssh_channel_request_shell1(ssh_channel channel);
+int ssh_channel_request_exec1(ssh_channel channel, const char *cmd);
+int ssh_channel_write1(ssh_channel channel, const void *data, int len);
ssh_channel ssh_get_channel1(ssh_session session);
#endif
diff --git a/src/channels.c b/src/channels.c
index 84e96083..60823200 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -864,7 +864,7 @@ int ssh_channel_open_session(ssh_channel channel) {
#ifdef WITH_SSH1
if (channel->session->version == 1) {
- return channel_open_session1(channel);
+ return ssh_channel_open_session1(channel);
}
#endif
@@ -1250,7 +1250,7 @@ static int channel_write_common(ssh_channel channel,
}
#ifdef WITH_SSH1
if (channel->version == 1) {
- rc = channel_write1(channel, data, len);
+ rc = ssh_channel_write1(channel, data, len);
return rc;
}
@@ -1633,7 +1633,7 @@ int ssh_channel_request_pty_size(ssh_channel channel, const char *terminal,
#ifdef WITH_SSH1
if (channel->version==1) {
- rc = channel_request_pty_size1(channel,terminal, col, row);
+ rc = ssh_channel_request_pty_size1(channel,terminal, col, row);
return rc;
}
@@ -1711,7 +1711,7 @@ int ssh_channel_change_pty_size(ssh_channel channel, int cols, int rows) {
#ifdef WITH_SSH1
if (channel->version == 1) {
- rc = channel_change_pty_size1(channel,cols,rows);
+ rc = ssh_channel_change_pty_size1(channel,cols,rows);
return rc;
}
@@ -1757,7 +1757,7 @@ int ssh_channel_request_shell(ssh_channel channel) {
}
#ifdef WITH_SSH1
if (channel->version == 1) {
- return channel_request_shell1(channel);
+ return ssh_channel_request_shell1(channel);
}
#endif
return channel_request(channel, "shell", NULL, 1);
@@ -2398,7 +2398,7 @@ int ssh_channel_request_exec(ssh_channel channel, const char *cmd) {
#ifdef WITH_SSH1
if (channel->version == 1) {
- return channel_request_exec1(channel, cmd);
+ return ssh_channel_request_exec1(channel, cmd);
}
#endif
switch(channel->request_state){
diff --git a/src/channels1.c b/src/channels1.c
index c3e7b92d..730649a7 100644
--- a/src/channels1.c
+++ b/src/channels1.c
@@ -51,7 +51,7 @@
* protocol.
*/
-int channel_open_session1(ssh_channel chan) {
+int ssh_channel_open_session1(ssh_channel chan) {
ssh_session session;
if (chan == NULL) {
@@ -91,7 +91,7 @@ int channel_open_session1(ssh_channel chan) {
* much simplier under ssh2. I just hope the defaults values are ok ...
*/
-int channel_request_pty_size1(ssh_channel channel, const char *terminal, int col,
+int ssh_channel_request_pty_size1(ssh_channel channel, const char *terminal, int col,
int row) {
ssh_session session;
ssh_string str = NULL;
@@ -158,7 +158,7 @@ int channel_request_pty_size1(ssh_channel channel, const char *terminal, int col
return SSH_ERROR;
}
-int channel_change_pty_size1(ssh_channel channel, int cols, int rows) {
+int ssh_channel_change_pty_size1(ssh_channel channel, int cols, int rows) {
ssh_session session;
if (channel == NULL) {
@@ -207,7 +207,7 @@ int channel_change_pty_size1(ssh_channel channel, int cols, int rows) {
}
-int channel_request_shell1(ssh_channel channel) {
+int ssh_channel_request_shell1(ssh_channel channel) {
ssh_session session;
if (channel == NULL) {
@@ -228,7 +228,7 @@ int channel_request_shell1(ssh_channel channel) {
return 0;
}
-int channel_request_exec1(ssh_channel channel, const char *cmd) {
+int ssh_channel_request_exec1(ssh_channel channel, const char *cmd) {
ssh_session session;
ssh_string command = NULL;
@@ -338,7 +338,7 @@ SSH_PACKET_CALLBACK(ssh_packet_exist_status1){
}
-int channel_write1(ssh_channel channel, const void *data, int len) {
+int ssh_channel_write1(ssh_channel channel, const void *data, int len) {
ssh_session session;
int origlen = len;
int effectivelen;