From 179268dc55b601fdfeba986ab502813883570853 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Thu, 5 Aug 2004 15:13:19 +0000 Subject: [PATCH] Follow actual InitCheck() semantics, part II. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8539 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../print/transports/hp_jetdirect/HPJetDirectTransport.cpp | 6 +++--- .../print/transports/hp_jetdirect/HPJetDirectTransport.h | 4 ++-- .../print/transports/hp_jetdirect/print_transport.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp b/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp index 3baceb6f63..d27b153ec6 100644 --- a/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp +++ b/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp @@ -45,7 +45,7 @@ // Implementation of HPJetDirectPort HPJetDirectPort::HPJetDirectPort(BDirectory* printer, BMessage *msg) - : fPort(9100), fEndpoint(NULL), fReady(false) + : fPort(9100), fEndpoint(NULL), fReady(B_ERROR) { fHost[0] = '\0'; @@ -65,7 +65,7 @@ HPJetDirectPort::HPJetDirectPort(BDirectory* printer, BMessage *msg) }; fEndpoint = new BNetEndpoint(SOCK_STREAM); - if (fEndpoint->InitCheck() != B_NO_ERROR) { + if ((fReady = fEndpoint->InitCheck()) != B_OK) { BAlert *alert = new BAlert("", "Fail to create the NetEndpoint!", "Damn"); alert->Go(); return; @@ -73,7 +73,7 @@ HPJetDirectPort::HPJetDirectPort(BDirectory* printer, BMessage *msg) if (fEndpoint->Connect(fHost, fPort) == B_OK) { printf("Connected to HP JetDirect printer port at %s:%d\n", fHost, fPort); - fReady = true; + fReady = B_OK; } else { BAlert *alert = new BAlert("", "Can't connect to HP JetDirect printer port!", "Bad luck"); alert->Go(); diff --git a/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.h b/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.h index 702cf20750..bd41eb8a22 100644 --- a/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.h +++ b/src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.h @@ -41,7 +41,7 @@ class HPJetDirectPort : public BDataIO { HPJetDirectPort(BDirectory* printer, BMessage* msg); ~HPJetDirectPort(); - bool Ready() { return fReady; } + status_t InitCheck() { return fReady; } ssize_t Read(void* buffer, size_t size); ssize_t Write(const void* buffer, size_t size); @@ -50,7 +50,7 @@ class HPJetDirectPort : public BDataIO { char fHost[256]; uint16 fPort; // default is 9100 BNetEndpoint *fEndpoint; - bool fReady; + status_t fReady; }; #endif diff --git a/src/add-ons/print/transports/hp_jetdirect/print_transport.cpp b/src/add-ons/print/transports/hp_jetdirect/print_transport.cpp index 87ed0fbf94..eb8920e3f3 100644 --- a/src/add-ons/print/transports/hp_jetdirect/print_transport.cpp +++ b/src/add-ons/print/transports/hp_jetdirect/print_transport.cpp @@ -55,7 +55,7 @@ extern "C" _EXPORT BDataIO * init_transport(BMessage *msg) if (printer.InitCheck() == B_OK) { HPJetDirectPort * transport = new HPJetDirectPort(&printer, msg); - if (transport->Ready()) { + if (transport->InitCheck() == B_OK) { g_transport = transport; if (msg) msg->what = 'okok';