Sfoglia il codice sorgente

Debug: always use BDSM_dbg

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Thomas Guillem 10 anni fa
parent
commit
3994ec2174
5 ha cambiato i file con 10 aggiunte e 10 eliminazioni
  1. 2 2
      src/netbios_session.c
  2. 3 3
      src/smb_message.c
  3. 1 1
      src/smb_ntlm.c
  4. 1 1
      src/smb_spnego.c
  5. 3 3
      src/smb_utils.c

+ 2 - 2
src/netbios_session.c

@@ -226,12 +226,12 @@ ssize_t           netbios_session_packet_recv(netbios_session *s, void **data)
     if (data != NULL)
       *data = (void *) s->packet->payload;
 
-    //fprintf(stderr, "Total = %ld, sofar = %ld\n", total, sofar);
+    //BDSM_dbg("Total = %ld, sofar = %ld\n", total, sofar);
 
     while (sofar < total)
     {
         res = recv(s->socket, (void *)(s->packet) + 4 + sofar, total - sofar, 0);
-        //xfprintf(stderr, "Total = %ld, sofar = %ld, res = %ld\n", total, sofar, res);
+        //BDSM_dbg("Total = %ld, sofar = %ld, res = %ld\n", total, sofar, res);
 
         if (res < 0)
         {

+ 3 - 3
src/smb_message.c

@@ -88,7 +88,7 @@ int             smb_message_append(smb_message *msg, const void *data,
     memcpy(msg->packet->payload + msg->cursor, data, data_size);
     msg->cursor += data_size;
 
-    //fprintf(stderr, "Cursor is at %d (append)\n", msg->cursor);
+    //BDSM_dbg("Cursor is at %d (append)\n", msg->cursor);
 
     return (1);
 }
@@ -102,7 +102,7 @@ int             smb_message_advance(smb_message *msg, size_t size)
 
     msg->cursor += size;
 
-    //fprintf(stderr, "Cursor is at %d (advance)\n", msg->cursor);
+    //BDSM_dbg("Cursor is at %d (advance)\n", msg->cursor);
     return (1);
 }
 
@@ -137,7 +137,7 @@ size_t          smb_message_put_utf16(smb_message *msg, const char *str,
     res = smb_message_append(msg, utf_str, utf_str_len);
     free(utf_str);
 
-    // fprintf(stderr, "put_utf16, adds %d bytes, cursor is at %d\n",
+    // BDSM_dbg("put_utf16, adds %d bytes, cursor is at %d\n",
     //         utf_str_len, msg->cursor);
 
     if (res)

+ 1 - 1
src/smb_ntlm.c

@@ -270,7 +270,7 @@ void        smb_ntlmssp_negotiate(const char *host, const char *domain,
     if (token->size % 2) // Align on Word
         token->size += 1;
     smb_buffer_alloc(token, token->size);
-    // fprintf(stderr, "Token size if %ld\n", token->size);
+    // BDSM_dbg("Token size if %ld\n", token->size);
 
 
     nego      = (smb_ntlmssp_nego *)token->data;

+ 1 - 1
src/smb_spnego.c

@@ -208,7 +208,7 @@ static int      challenge(smb_session *s)
     s->srv.challenge = challenge->challenge;
     s->srv.uid       = msg.packet->header.uid;
 
-    fprintf(stderr, "Server challenge is 0x%"PRIx64"\n", s->srv.challenge);
+    BDSM_dbg("Server challenge is 0x%"PRIx64"\n", s->srv.challenge);
 
     return (1);
 }

+ 3 - 3
src/smb_utils.c

@@ -44,7 +44,7 @@ static const char *current_encoding()
         setlocale(LC_ALL, "");
         locale_set = 1;
     }
-    //fprintf(stderr, "%s\n", nl_langinfo(CODESET));
+    //BDSM_dbg("%s\n", nl_langinfo(CODESET));
     return (nl_langinfo(CODESET));
 #endif
 }
@@ -67,8 +67,8 @@ static size_t smb_iconv(const char *src, size_t src_len, char **dst,
 
     if ((ic = iconv_open(dst_enc, src_enc)) == (iconv_t)-1)
     {
-        fprintf(stderr, "Unable to open iconv to convert from %s to %s\n",
-                src_enc, dst_enc);
+        BDSM_dbg("Unable to open iconv to convert from %s to %s\n",
+                 src_enc, dst_enc);
         return (0);
     }