Remove unused src_env parameter to smb_message_put_utf16

include/bdsm/smb_message.h

@@ -32,8 +32,8 @@ int             smb_message_put8(smb_message *msg, uint8_t data);
 int             smb_message_put16(smb_message *msg, uint16_t data);
 int             smb_message_put32(smb_message *msg, uint32_t data);
 int             smb_message_put64(smb_message *msg, uint64_t data);
-size_t          smb_message_put_utf16(smb_message *msg, const char *src_enc,
-                                      const char *str, size_t str_len);
+size_t          smb_message_put_utf16(smb_message *msg, const char *str,
+                                      size_t str_len);
 int             smb_message_put_uuid(smb_message *msg, uint32_t a, uint16_t b,
                                      uint16_t c, const uint8_t e[8]);
 

src/smb_file.c

@@ -65,7 +65,7 @@ smb_fd      smb_fopen(smb_session *s, smb_tid tid, const char *path,
   // Create AndX 'Body'
   smb_message_advance(req_msg, sizeof(smb_create_req));
   smb_message_put8(req_msg, 0);   // Align beginning of path
-  path_len = smb_message_put_utf16(req_msg, "", path, strlen(path) + 1);
+  path_len = smb_message_put_utf16(req_msg, path, strlen(path) + 1);
   // smb_message_put16(req_msg, 0);  // ??
   req->path_length  = path_len;
   req->bct          = path_len + 1;

src/smb_message.c

@@ -128,8 +128,8 @@ int             smb_message_put64(smb_message *msg, uint64_t data)
     return(smb_message_append(msg, (void *)&data, 8));
 }
 
-size_t          smb_message_put_utf16(smb_message *msg, const char *src_enc,
-                                      const char *str, size_t str_len)
+size_t          smb_message_put_utf16(smb_message *msg, const char *str,
+                                      size_t str_len)
 {
   char          *utf_str;
   size_t        utf_str_len;
@@ -139,9 +139,6 @@ size_t          smb_message_put_utf16(smb_message *msg, const char *src_enc,
   res = smb_message_append(msg, utf_str, utf_str_len);
   free(utf_str);
 
-  if (src_enc != NULL)
-    BDSM_dbg("smb_message_put_utf16: src_enc not supported. We use system locale\n");
-
   // fprintf(stderr, "put_utf16, adds %d bytes, cursor is at %d\n",
   //         utf_str_len, msg->cursor);
 

src/smb_session.c

@@ -268,13 +268,13 @@ static int        smb_session_login_ntlm(smb_session *s, const char *domain,
   if (msg->cursor / 2) // Padding !
     smb_message_put8(msg, 0);
 
-  smb_message_put_utf16(msg, "", user, strlen(user));
+  smb_message_put_utf16(msg, user, strlen(user));
   smb_message_put16(msg, 0);
-  smb_message_put_utf16(msg, "", domain, strlen(domain));
+  smb_message_put_utf16(msg, domain, strlen(domain));
   smb_message_put16(msg, 0);
-  smb_message_put_utf16(msg, "", SMB_OS, strlen(SMB_OS));
+  smb_message_put_utf16(msg, SMB_OS, strlen(SMB_OS));
   smb_message_put16(msg, 0);
-  smb_message_put_utf16(msg, "", SMB_LANMAN, strlen(SMB_LANMAN));
+  smb_message_put_utf16(msg, SMB_LANMAN, strlen(SMB_LANMAN));
   smb_message_put16(msg, 0);
 
   req->payload_size = msg->cursor - sizeof(smb_session_req);

src/smb_share.c

@@ -61,7 +61,7 @@ smb_tid         smb_tree_connect(smb_session *s, const char *name)
   req->passwd_len   = 1;    // Null byte
 
   smb_message_put8(req_msg, 0); // Ze null byte password;
-  smb_message_put_utf16(req_msg, "", path, strlen(path) + 1);
+  smb_message_put_utf16(req_msg, path, strlen(path) + 1);
   smb_message_append(req_msg, "?????", strlen("?????") + 1);
   req->bct = strlen(path) * 2 + 2 + 6 + 1;
 
@@ -215,7 +215,7 @@ size_t          smb_share_get_list(smb_session *s, char ***list)
   trans->bct                    = 89;
 
   smb_message_put8(req, 0);   // Padding
-  smb_message_put_utf16(req, "", "\\PIPE\\", strlen("\\PIPE\\") + 1);
+  smb_message_put_utf16(req, "\\PIPE\\", strlen("\\PIPE\\") + 1);
   smb_message_put16(req, 0);  // Padding to be aligned with wtf boundary :-/
 
   // Now we'll 'build' the DCE/RPC Packet. This basically a copycat
@@ -281,7 +281,7 @@ size_t          smb_share_get_list(smb_session *s, char ***list)
   trans->fid              = SMB_FD_FID(srvscv_fd);
 
   smb_message_put8(req, 0);  // Padding
-  smb_message_put_utf16(req, "", "\\PIPE\\", strlen("\\PIPE\\") + 1);
+  smb_message_put_utf16(req, "\\PIPE\\", strlen("\\PIPE\\") + 1);
   smb_message_put16(req, 0); // Padding
 
   // Now we'll 'build' the DCE/RPC Packet. This basically a copycat
@@ -306,7 +306,7 @@ size_t          smb_share_get_list(smb_session *s, char ***list)
   smb_message_put32(req, 0);            // Offset
   smb_message_put32(req, strlen(s->srv.name) + 1);            // Actual count
     // The server name, supposed to be downcased
-  smb_message_put_utf16(req, "", s->srv.name, strlen(s->srv.name) + 1);
+  smb_message_put_utf16(req, s->srv.name, strlen(s->srv.name) + 1);
   if ((strlen(s->srv.name) % 2) == 0) // It won't be aligned with the terminating byte
     smb_message_put16(req, 0);
 

src/smb_spnego.c

@@ -119,9 +119,9 @@ static int      negotiate(smb_session *s, const char *domain)
   }
 
   smb_message_append(msg, der, der_size);
-  smb_message_put_utf16(msg, "", SMB_OS, strlen(SMB_OS));
+  smb_message_put_utf16(msg, SMB_OS, strlen(SMB_OS));
   smb_message_put16(msg, 0);
-  smb_message_put_utf16(msg, "", SMB_LANMAN, strlen(SMB_LANMAN));
+  smb_message_put_utf16(msg, SMB_LANMAN, strlen(SMB_LANMAN));
   smb_message_put16(msg, 0);
   smb_message_put16(msg, 0);
 
@@ -270,9 +270,9 @@ static int      auth(smb_session *s, const char *domain, const char *user,
   smb_message_append(msg, der, der_size);
   if (msg->cursor % 2)
     smb_message_put8(msg, 0);
-  smb_message_put_utf16(msg, "", SMB_OS, strlen(SMB_OS));
+  smb_message_put_utf16(msg, SMB_OS, strlen(SMB_OS));
   smb_message_put16(msg, 0);
-  smb_message_put_utf16(msg, "", SMB_LANMAN, strlen(SMB_LANMAN));
+  smb_message_put_utf16(msg, SMB_LANMAN, strlen(SMB_LANMAN));
   smb_message_put16(msg, 0);
   smb_message_put16(msg, 0); // Empty PDC name
 

src/smb_trans2.c

@@ -144,7 +144,7 @@ smb_file  *smb_find(smb_session *s, smb_tid tid, const char *pattern)
 
   smb_message_advance(msg, sizeof(smb_trans2_req));
   smb_message_advance(msg, sizeof(smb_tr2_find2));
-  smb_message_put_utf16(msg, "", pattern, pattern_len);
+  smb_message_put_utf16(msg, pattern, pattern_len);
 
   // Adds padding at the end if necessary.
   while (tr2->bct % 4)
@@ -206,7 +206,7 @@ smb_file  *smb_fstat(smb_session *s, smb_tid tid, const char *path)
 
   smb_message_advance(msg, sizeof(smb_trans2_req));
   smb_message_advance(msg, sizeof(smb_tr2_query));
-  smb_message_put_utf16(msg, "", path, path_len);
+  smb_message_put_utf16(msg, path, path_len);
 
   // Adds padding at the end if necessary.
   if (msg->cursor % 4)