lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-13 04:42:23 +03:00
Code Activity

cleanup: use ssh_ prefix in the channels (non-static) functions

Browse Source 
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>
This commit is contained in:
Fabiano Fidêncio
2015-09-17 10:09:06 +02:00
parent adc8c20ac1
commit 501faacf8e
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/libssh/channels.h
View File

@@ -105,13 +105,13 @@ SSH_PACKET_CALLBACK(ssh_packet_close1);
SSH_PACKET_CALLBACK(ssh_packet_exist_status1); SSH_PACKET_CALLBACK(ssh_packet_exist_status1);
/* channels1.c */ /* channels1.c */
int channel_open_session1(ssh_channel channel); int ssh_channel_open_session1(ssh_channel channel);
int channel_request_pty_size1(ssh_channel channel, const char *terminal, int ssh_channel_request_pty_size1(ssh_channel channel, const char *terminal,
int cols, int rows); int cols, int rows);
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);
int channel_request_shell1(ssh_channel channel); int ssh_channel_request_shell1(ssh_channel channel);
int channel_request_exec1(ssh_channel channel, const char *cmd); int ssh_channel_request_exec1(ssh_channel channel, const char *cmd);
int channel_write1(ssh_channel channel, const void *data, int len); int ssh_channel_write1(ssh_channel channel, const void *data, int len);
ssh_channel ssh_get_channel1(ssh_session session); ssh_channel ssh_get_channel1(ssh_session session);
#endif #endif

12
src/channels.c
View File

@@ -864,7 +864,7 @@ int ssh_channel_open_session(ssh_channel channel) {
#ifdef WITH_SSH1 #ifdef WITH_SSH1
if (channel->session->version == 1) { if (channel->session->version == 1) {
return channel_open_session1(channel); return ssh_channel_open_session1(channel);
} }
#endif #endif
@@ -1250,7 +1250,7 @@ static int channel_write_common(ssh_channel channel,
} }
#ifdef WITH_SSH1 #ifdef WITH_SSH1
if (channel->version == 1) { if (channel->version == 1) {
rc = channel_write1(channel, data, len); rc = ssh_channel_write1(channel, data, len);
return rc; return rc;
} }
@@ -1633,7 +1633,7 @@ int ssh_channel_request_pty_size(ssh_channel channel, const char *terminal,
#ifdef WITH_SSH1 #ifdef WITH_SSH1
if (channel->version==1) { 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; return rc;
} }
@@ -1711,7 +1711,7 @@ int ssh_channel_change_pty_size(ssh_channel channel, int cols, int rows) {
#ifdef WITH_SSH1 #ifdef WITH_SSH1
if (channel->version == 1) { if (channel->version == 1) {
rc = channel_change_pty_size1(channel,cols,rows); rc = ssh_channel_change_pty_size1(channel,cols,rows);
return rc; return rc;
} }
@@ -1757,7 +1757,7 @@ int ssh_channel_request_shell(ssh_channel channel) {
} }
#ifdef WITH_SSH1 #ifdef WITH_SSH1
if (channel->version == 1) { if (channel->version == 1) {
return channel_request_shell1(channel); return ssh_channel_request_shell1(channel);
} }
#endif #endif
return channel_request(channel, "shell", NULL, 1); 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 #ifdef WITH_SSH1
if (channel->version == 1) { if (channel->version == 1) {
return channel_request_exec1(channel, cmd); return ssh_channel_request_exec1(channel, cmd);
} }
#endif #endif
switch(channel->request_state){ switch(channel->request_state){

12
src/channels1.c
View File

@@ -51,7 +51,7 @@
* protocol. * protocol.
*/ */
int channel_open_session1(ssh_channel chan) { int ssh_channel_open_session1(ssh_channel chan) {
ssh_session session; ssh_session session;
if (chan == NULL) { 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 ... * 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) { int row) {
ssh_session session; ssh_session session;
ssh_string str = NULL; ssh_string str = NULL;
@@ -158,7 +158,7 @@ int channel_request_pty_size1(ssh_channel channel, const char *terminal, int col
return SSH_ERROR; 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; ssh_session session;
if (channel == NULL) { 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; ssh_session session;
if (channel == NULL) { if (channel == NULL) {
@@ -228,7 +228,7 @@ int channel_request_shell1(ssh_channel channel) {
return 0; 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_session session;
ssh_string command = NULL; 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; ssh_session session;
int origlen = len; int origlen = len;
int effectivelen; int effectivelen;