Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow actual InitCheck() semantics, part II. 

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8539 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin 2004-08-05 15:13:19 +00:00
parent 39a650c883
commit 179268dc55
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp
View File

@ -45,7 +45,7 @@
// Implementation of HPJetDirectPort // Implementation of HPJetDirectPort
HPJetDirectPort::HPJetDirectPort(BDirectory* printer, BMessage *msg) HPJetDirectPort::HPJetDirectPort(BDirectory* printer, BMessage *msg)
: fPort(9100), fEndpoint(NULL), fReady(false) : fPort(9100), fEndpoint(NULL), fReady(B_ERROR)
{ {
fHost[0] = '\0'; fHost[0] = '\0';
@ -65,7 +65,7 @@ HPJetDirectPort::HPJetDirectPort(BDirectory* printer, BMessage *msg)
}; };
fEndpoint = new BNetEndpoint(SOCK_STREAM); 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"); BAlert *alert = new BAlert("", "Fail to create the NetEndpoint!", "Damn");
alert->Go(); alert->Go();
return; return;
@ -73,7 +73,7 @@ HPJetDirectPort::HPJetDirectPort(BDirectory* printer, BMessage *msg)
if (fEndpoint->Connect(fHost, fPort) == B_OK) { if (fEndpoint->Connect(fHost, fPort) == B_OK) {
printf("Connected to HP JetDirect printer port at %s:%d\n", fHost, fPort); printf("Connected to HP JetDirect printer port at %s:%d\n", fHost, fPort);
fReady = true; fReady = B_OK;
} else { } else {
BAlert *alert = new BAlert("", "Can't connect to HP JetDirect printer port!", "Bad luck"); BAlert *alert = new BAlert("", "Can't connect to HP JetDirect printer port!", "Bad luck");
alert->Go(); alert->Go();

4
src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.h
View File

@ -41,7 +41,7 @@ class HPJetDirectPort : public BDataIO {
HPJetDirectPort(BDirectory* printer, BMessage* msg); HPJetDirectPort(BDirectory* printer, BMessage* msg);
~HPJetDirectPort(); ~HPJetDirectPort();
bool Ready() { return fReady; } status_t InitCheck() { return fReady; }
ssize_t Read(void* buffer, size_t size); ssize_t Read(void* buffer, size_t size);
ssize_t Write(const 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]; char fHost[256];
uint16 fPort; // default is 9100 uint16 fPort; // default is 9100
BNetEndpoint *fEndpoint; BNetEndpoint *fEndpoint;
bool fReady; status_t fReady;
}; };
#endif #endif

2
src/add-ons/print/transports/hp_jetdirect/print_transport.cpp
View File

@ -55,7 +55,7 @@ extern "C" _EXPORT BDataIO * init_transport(BMessage *msg)
if (printer.InitCheck() == B_OK) { if (printer.InitCheck() == B_OK) {
HPJetDirectPort * transport = new HPJetDirectPort(&printer, msg); HPJetDirectPort * transport = new HPJetDirectPort(&printer, msg);
if (transport->Ready()) { if (transport->InitCheck() == B_OK) {
g_transport = transport; g_transport = transport;
if (msg) if (msg)
msg->what = 'okok'; msg->what = 'okok';