- Timestamp:
- Jul 27, 2010, 10:50:36 PM (14 years ago)
- Branches:
- master, release-1.10, release-1.7, release-1.8, release-1.9
- Children:
- 35a30f9
- Parents:
- f93cc34 (diff), 26ad412 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
zephyr.c
r987cf3f re488ec5 179 179 { 180 180 #ifdef HAVE_LIBZEPHYR 181 if(owl_global_is_havezephyr(&g)) 182 return(ZPending()); 181 Code_t code; 182 if(owl_global_is_havezephyr(&g)) { 183 if((code = ZPending()) < 0) { 184 owl_function_debugmsg("Error (%s) in ZPending()\n", 185 error_message(code)); 186 return 0; 187 } 188 return code; 189 } 183 190 #endif 184 191 return 0; … … 1397 1404 #ifdef HAVE_LIBZEPHYR 1398 1405 ZNotice_t notice; 1406 Code_t code; 1399 1407 owl_message *m=NULL; 1400 1408 1401 1409 while(owl_zephyr_zpending() && zpendcount < OWL_MAX_ZEPHYRGRAMS_TO_PROCESS) { 1402 1410 if (owl_zephyr_zpending()) { 1403 ZReceiveNotice(¬ice, NULL); 1411 if ((code = ZReceiveNotice(¬ice, NULL)) != ZERR_NONE) { 1412 owl_function_debugmsg("Error: %s while calling ZReceiveNotice\n", 1413 error_message(code)); 1414 continue; 1415 } 1404 1416 zpendcount++; 1405 1417
Note: See TracChangeset
for help on using the changeset viewer.