From 6bbdaceaca06e3af4df5d4f265630ea651bc9044 Mon Sep 17 00:00:00 2001
From: Joseph Southwell <joseph@southwell.org>
Date: Sun, 2 Feb 2014 19:28:51 +0100
Subject: src: Define MAX_BUF_SIZE globally and use it.

Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
---
 src/misc.c   | 1 -
 src/scp.c    | 4 ++--
 src/sftp.c   | 2 +-
 src/socket.c | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/misc.c b/src/misc.c
index 693189f2..6daf60ab 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -697,7 +697,6 @@ char *ssh_path_expand_tilde(const char *d) {
 }
 
 char *ssh_path_expand_escape(ssh_session session, const char *s) {
-#define MAX_BUF_SIZE 4096
     char host[NI_MAXHOST];
     char buf[MAX_BUF_SIZE];
     char *r, *x = NULL;
diff --git a/src/scp.c b/src/scp.c
index db07aed4..a245402a 100644
--- a/src/scp.c
+++ b/src/scp.c
@@ -545,7 +545,7 @@ int ssh_scp_read_string(ssh_scp scp, char *buffer, size_t len){
  * @see ssh_scp_request_get_warning()
  */
 int ssh_scp_pull_request(ssh_scp scp){
-  char buffer[4096] = {0};
+  char buffer[MAX_BUF_SIZE] = {0};
   char *mode=NULL;
   char *p,*tmp;
   uint64_t size;
@@ -642,7 +642,7 @@ int ssh_scp_pull_request(ssh_scp scp){
  *                      the message failed, or sending it in a bad state.
  */
 int ssh_scp_deny_request(ssh_scp scp, const char *reason){
-  char buffer[4096];
+  char buffer[MAX_BUF_SIZE];
   int err;
   if(scp==NULL)
       return SSH_ERROR;
diff --git a/src/sftp.c b/src/sftp.c
index b5046f23..36974563 100644
--- a/src/sftp.c
+++ b/src/sftp.c
@@ -308,7 +308,7 @@ int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload){
 }
 
 sftp_packet sftp_packet_read(sftp_session sftp) {
-  unsigned char buffer[4096];
+  unsigned char buffer[MAX_BUF_SIZE];
   sftp_packet packet = NULL;
   uint32_t size;
   int r;
diff --git a/src/socket.c b/src/socket.c
index dd414ef0..935137c1 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -218,7 +218,7 @@ void ssh_socket_set_callbacks(ssh_socket s, ssh_socket_callbacks callbacks){
  */
 int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, int revents, void *v_s){
 	ssh_socket s=(ssh_socket )v_s;
-	char buffer[4096];
+	char buffer[MAX_BUF_SIZE];
 	int r;
 	int err=0;
 	socklen_t errlen=sizeof(err);
-- 
cgit