Merge master

[netatalk.git] / libatalk / dsi / dsi_cmdreply.c

diff --git a/libatalk/dsi/dsi_cmdreply.c b/libatalk/dsi/dsi_cmdreply.c
index ae24535ddd11b85fb9e0a70eaf59f32520e81e72..5b0d627de2c788e7356ffeb50219163d6007cb3c 100644 (file)
--- a/libatalk/dsi/dsi_cmdreply.c
+++ b/libatalk/dsi/dsi_cmdreply.c
@@ -8,9 +8,10 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
+#include <arpa/inet.h>
+
 #include <atalk/dsi.h>
 #include <atalk/logger.h>
-#include <netatalk/endian.h>
 
 /* this assumes that the reply follows right after the command, saving
  * on a couple assignments. specifically, command, requestID, and
@@ -19,8 +20,8 @@ int dsi_cmdreply(DSI *dsi, const int err)
 {
     int ret;
 
-    LOG(log_debug, logtype_dsi, "dsi_cmdreply(DSI ID: %u, len: %jd): START",
-        dsi->clientID, (intmax_t)dsi->datalen);
+    LOG(log_debug, logtype_dsi, "dsi_cmdreply(DSI ID: %u, len: %zd): START",
+        dsi->clientID, dsi->datalen);
 
     dsi->header.dsi_flags = DSIFL_REPLY;
     dsi->header.dsi_len = htonl(dsi->datalen);
@@ -28,8 +29,8 @@ int dsi_cmdreply(DSI *dsi, const int err)
 
     ret = dsi_stream_send(dsi, dsi->data, dsi->datalen);
 
-    LOG(log_debug, logtype_dsi, "dsi_cmdreply(DSI ID: %u, len: %jd): END",
-        dsi->clientID, (intmax_t)dsi->datalen);
+    LOG(log_debug, logtype_dsi, "dsi_cmdreply(DSI ID: %u, len: %zd): END",
+        dsi->clientID, dsi->datalen);
 
     return ret;
 }