author | Michael Krelin <hacker@klever.net> | 2007-07-15 23:55:02 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-15 23:55:02 (UTC) |
commit | 174edcd91bcb969c4ee71a824849d8737223dd8f (patch) (unidiff) | |
tree | 912ef42f7902a1c400ed469e8abc322346765ef3 | |
parent | 655a28b22bfb5cb2b8080eaf8f3c3d0ef769882e (diff) | |
download | opie-174edcd91bcb969c4ee71a824849d8737223dd8f.zip opie-174edcd91bcb969c4ee71a824849d8737223dd8f.tar.gz opie-174edcd91bcb969c4ee71a824849d8737223dd8f.tar.bz2 |
unbreak error handling while preserving functionality
- exit after disconnecting
- spit out error message on error
- don't close fd in the loop, once is enough
-rw-r--r-- | core/obex/obexserver.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index 786e9f7..286961f 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp | |||
@@ -216,2 +216,3 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object, | |||
216 | OBEX_TransportDisconnect(handle); | 216 | OBEX_TransportDisconnect(handle); |
217 | _exit(0); | ||
217 | break; | 218 | break; |
@@ -436,3 +437,2 @@ bool ObexServer::start(RunMode runmode, Communication comm) | |||
436 | if (initObex() == 0) { | 437 | if (initObex() == 0) { |
437 | do { | ||
438 | if ( fd[ 1 ] ) { | 438 | if ( fd[ 1 ] ) { |
@@ -441,4 +441,7 @@ bool ObexServer::start(RunMode runmode, Communication comm) | |||
441 | } | 441 | } |
442 | if (OBEX_HandleInput(m_obex, 10) < 0) | 442 | do { |
443 | _exit(0); | 443 | if (OBEX_HandleInput(m_obex, 60) < 0) { |
444 | fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n"); | ||
445 | _exit(1); | ||
446 | } | ||
444 | } while(1); | 447 | } while(1); |