Changeset e488ec5 for zephyr.c


Ignore:
Timestamp:
Jul 27, 2010, 10:50:36 PM (11 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, 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.
Message:
Merge branch 'security'
File:
1 edited

Legend:

Unmodified
Added
Removed
  • zephyr.c

    r987cf3f re488ec5  
    179179{
    180180#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  }
    183190#endif
    184191  return 0;
     
    13971404#ifdef HAVE_LIBZEPHYR
    13981405  ZNotice_t notice;
     1406  Code_t code;
    13991407  owl_message *m=NULL;
    14001408
    14011409  while(owl_zephyr_zpending() && zpendcount < OWL_MAX_ZEPHYRGRAMS_TO_PROCESS) {
    14021410    if (owl_zephyr_zpending()) {
    1403       ZReceiveNotice(&notice, NULL);
     1411      if ((code = ZReceiveNotice(&notice, NULL)) != ZERR_NONE) {
     1412        owl_function_debugmsg("Error: %s while calling ZReceiveNotice\n",
     1413                              error_message(code));
     1414        continue;
     1415      }
    14041416      zpendcount++;
    14051417
Note: See TracChangeset for help on using the changeset viewer.