Change all occurences of STRING * to ssh_string

1 files changed, 21 insertions, 21 deletions

diff --git a/libssh/sftp.c b/libssh/sftp.c
index 790984aa..ab361043 100644
--- a/libssh/sftp.c
+++ b/libssh/sftp.c
@@ -419,8 +419,8 @@ void sftp_packet_free(SFTP_PACKET *packet) {
 int sftp_init(SFTP_SESSION *sftp) {
   SFTP_PACKET *packet = NULL;
   BUFFER *buffer = NULL;
-  STRING *ext_name_s = NULL;
-  STRING *ext_data_s = NULL;
+  ssh_string ext_name_s = NULL;
+  ssh_string ext_data_s = NULL;
   char *ext_name = NULL;
   char *ext_data = NULL;
   u32 version = htonl(LIBSFTP_VERSION);
@@ -672,7 +672,7 @@ SFTP_DIR *sftp_opendir(SFTP_SESSION *sftp, const char *path){
   SFTP_FILE *file = NULL;
   SFTP_DIR *dir = NULL;
   STATUS_MESSAGE *status;
-  STRING *path_s;
+  ssh_string path_s;
   BUFFER *payload;
   u32 id;
 
@@ -760,8 +760,8 @@ SFTP_DIR *sftp_opendir(SFTP_SESSION *sftp, const char *path){
 static SFTP_ATTRIBUTES *sftp_parse_attr_4(SFTP_SESSION *sftp, BUFFER *buf,
     int expectnames) {
   SFTP_ATTRIBUTES *attr;
-  STRING *owner = NULL;
-  STRING *group = NULL;
+  ssh_string owner = NULL;
+  ssh_string group = NULL;
   u32 flags = 0;
   int ok = 0;
 
@@ -935,8 +935,8 @@ static SFTP_ATTRIBUTES *sftp_parse_attr_4(SFTP_SESSION *sftp, BUFFER *buf,
                    so that number of pairs equals extended_count              */
 static SFTP_ATTRIBUTES *sftp_parse_attr_3(SFTP_SESSION *sftp, BUFFER *buf,
     int expectname) {
-  STRING *longname = NULL;
-  STRING *name = NULL;
+  ssh_string longname = NULL;
+  ssh_string name = NULL;
   SFTP_ATTRIBUTES *attr;
   u32 flags = 0;
   int ok = 0;
@@ -1263,7 +1263,7 @@ void sftp_attributes_free(SFTP_ATTRIBUTES *file){
   SAFE_FREE(file);
 }
 
-static int sftp_handle_close(SFTP_SESSION *sftp, STRING *handle) {
+static int sftp_handle_close(SFTP_SESSION *sftp, ssh_string handle) {
   STATUS_MESSAGE *status;
   SFTP_MESSAGE *msg = NULL;
   BUFFER *buffer = NULL;
@@ -1366,7 +1366,7 @@ SFTP_FILE *sftp_open(SFTP_SESSION *sftp, const char *file, int flags,
   STATUS_MESSAGE *status;
   SFTP_ATTRIBUTES attr;
   SFTP_FILE *handle;
-  STRING *filename;
+  ssh_string filename;
   BUFFER *buffer;
   u32 sftp_flags = 0;
   u32 id;
@@ -1463,7 +1463,7 @@ ssize_t sftp_read(SFTP_FILE *handle, void *buf, size_t count) {
   SFTP_SESSION *sftp = handle->sftp;
   SFTP_MESSAGE *msg = NULL;
   STATUS_MESSAGE *status;
-  STRING *datastring;
+  ssh_string datastring;
   BUFFER *buffer;
   int id;
 
@@ -1587,7 +1587,7 @@ int sftp_async_read(SFTP_FILE *file, void *data, u32 size, u32 id){
   SFTP_SESSION *sftp = file->sftp;
   SFTP_MESSAGE *msg = NULL;
   STATUS_MESSAGE *status;
-  STRING *datastring;
+  ssh_string datastring;
   int err = SSH_OK;
   u32 len;
 
@@ -1677,7 +1677,7 @@ ssize_t sftp_write(SFTP_FILE *file, const void *buf, size_t count) {
   SFTP_SESSION *sftp = file->sftp;
   SFTP_MESSAGE *msg = NULL;
   STATUS_MESSAGE *status;
-  STRING *datastring;
+  ssh_string datastring;
   BUFFER *buffer;
   u32 id;
   int len;
@@ -1794,7 +1794,7 @@ int sftp_rm(SFTP_SESSION *sftp, const char *file) {
 int sftp_unlink(SFTP_SESSION *sftp, const char *file) {
   STATUS_MESSAGE *status = NULL;
   SFTP_MESSAGE *msg = NULL;
-  STRING *filename;
+  ssh_string filename;
   BUFFER *buffer;
   u32 id;
 
@@ -1863,7 +1863,7 @@ int sftp_unlink(SFTP_SESSION *sftp, const char *file) {
 int sftp_rmdir(SFTP_SESSION *sftp, const char *directory) {
   STATUS_MESSAGE *status = NULL;
   SFTP_MESSAGE *msg = NULL;
-  STRING *filename;
+  ssh_string filename;
   BUFFER *buffer;
   u32 id;
 
@@ -1933,7 +1933,7 @@ int sftp_mkdir(SFTP_SESSION *sftp, const char *directory, mode_t mode) {
   SFTP_ATTRIBUTES *errno_attr = NULL;
   SFTP_ATTRIBUTES attr;
   BUFFER *buffer;
-  STRING *path;
+  ssh_string path;
   u32 id;
 
   buffer = buffer_new();
@@ -2020,8 +2020,8 @@ int sftp_rename(SFTP_SESSION *sftp, const char *original, const char *newname) {
   STATUS_MESSAGE *status = NULL;
   SFTP_MESSAGE *msg = NULL;
   BUFFER *buffer;
-  STRING *oldpath;
-  STRING *newpath;
+  ssh_string oldpath;
+  ssh_string newpath;
   u32 id;
 
   buffer = buffer_new();
@@ -2103,7 +2103,7 @@ int sftp_rename(SFTP_SESSION *sftp, const char *original, const char *newname) {
 int sftp_setstat(SFTP_SESSION *sftp, const char *file, SFTP_ATTRIBUTES *attr) {
   u32 id = sftp_get_new_id(sftp);
   BUFFER *buffer = buffer_new();
-  STRING *path = string_from_char(file);
+  ssh_string path = string_from_char(file);
   SFTP_MESSAGE *msg = NULL;
   STATUS_MESSAGE *status = NULL;
 
@@ -2216,8 +2216,8 @@ int sftp_utimes(SFTP_SESSION *sftp, const char *file,
 char *sftp_canonicalize_path(SFTP_SESSION *sftp, const char *path) {
   STATUS_MESSAGE *status = NULL;
   SFTP_MESSAGE *msg = NULL;
-  STRING *name = NULL;
-  STRING *pathstr;
+  ssh_string name = NULL;
+  ssh_string pathstr;
   BUFFER *buffer;
   char *cname;
   u32 ignored;
@@ -2291,7 +2291,7 @@ static SFTP_ATTRIBUTES *sftp_xstat(SFTP_SESSION *sftp, const char *path,
     int param) {
   STATUS_MESSAGE *status = NULL;
   SFTP_MESSAGE *msg = NULL;
-  STRING *pathstr;
+  ssh_string pathstr;
   BUFFER *buffer;
   u32 id;