X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-my-client.cpp;h=3336587efb182dda8572072c0c5465030baf9c64;hb=572f0d8babb3b5263f9848e094f80a3ea5926770;hp=c31089584a62d24c9ae110e7b361b2d1a9171946;hpb=7411ed6df7fc0b535f83503f73d70e80f390e295;p=yazpp-moved-to-github.git

diff --git a/src/yaz-my-client.cpp b/src/yaz-my-client.cpp
index c310895..3336587 100644
--- a/src/yaz-my-client.cpp
+++ b/src/yaz-my-client.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-my-client.cpp,v 1.21 2005-06-25 15:53:19 adam Exp $
+ * $Id: yaz-my-client.cpp,v 1.24 2006-10-10 13:31:49 adam Exp $
  */
 
 #include <stdlib.h>
@@ -10,9 +10,9 @@
 #include <yaz/options.h>
 #include <yaz/diagbib1.h>
 #include <yaz/marcdisp.h>
-#include <yaz++/ir-assoc.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/ir-assoc.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
 
 extern "C" {
 #if HAVE_READLINE_READLINE_H
@@ -57,7 +57,7 @@ public:
     void timeoutNotify();
     char *get_cookie (Z_OtherInformation **oi);
     int processCommand(const char *cmd);
-    const char *MyClient::getCommand();
+    const char *getCommand();
     int cmd_open(char *host);
     int cmd_connect(char *host);
     int cmd_quit(char *args);
@@ -311,7 +311,7 @@ void MyClient::recv_record(Z_DatabaseRecord *record, int offset,
         if (!(*etype->fun)(odr_decode(), (char **)&rr, 0, 0))
         {
             odr_perror(odr_decode(), "Decoding constructed record.");
-            fprintf(stderr, "[Near %d]\n", odr_offset(odr_decode()));
+            fprintf(stderr, "[Near %ld]\n", (long) odr_offset(odr_decode()));
             fprintf(stderr, "Packet dump:\n---------\n");
             odr_dumpBER(stderr, (char*)record->u.octet_aligned->buf,
                         record->u.octet_aligned->len);