Solaris Studio issues warnings for statements which can not be reached,
such as statements following an infinite loop. For example, the return
statement will generate a 'statement not reached' warning in the
following code:
while (1) {
/* no breaks or gotos in this body */
}
return 0;
Suppress these warnings by conditionally removing such statements when
building under Solaris Studio.
Reviewed-on: https://gerrit.openafs.org/12958
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit
f47cb2d4a957910c3e7d4b755f41ddef5dd103c5)
Change-Id: I3ac84edbc18d7b6aebd568e9a1c4a3e47aba5512
Reviewed-on: https://gerrit.openafs.org/13107
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
}
}
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
static afs_int32
bnode_ApplyInstance(bdrestart, 0);
}
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
#ifdef AFS_AIX32_ENV
curPollPtr = 0;
} /*done */
} /*w */
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
/* bc_jobNumber
IOMGR_Sleep(2);
#endif
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
#define AFS_NONNULL(x)
#endif
+/*
+ * Conditionally remove unreached statements under Solaris Studio.
+ */
+#if defined(__SUNPRO_C)
+# define AFS_UNREACHED(x)
+#else
+# define AFS_UNREACHED(x) x
+#endif
+
#endif /* OPENAFS_CONFIG_AFS_STDS_H */
if (code)
fprintf(stderr, "[%s] IOMGR_Select returned code %d\n", rn, code);
} /*Service loop */
- free(stats64.ViceStatistics64_val);
-
- return NULL;
+ AFS_UNREACHED(free(stats64.ViceStatistics64_val));
+ AFS_UNREACHED(return(NULL));
} /*fsprobe_LWP */
/*list all the partitions on <aserver> */
/* close the log so it can be removed */
ReOpenLog(); /* no trunc, just append */
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
}
LWP_DispatchProcess();
}
- return (void *)-1; /* keeps compilers happy. */
+ AFS_UNREACHED(return((void *)-1)); /* keeps compilers happy. */
}
/************************\
handlers[receivedSignal].handler(receivedSignal);
}
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
static void
rxi_ServerProc(threadID, newcall, &sock);
/* osi_Assert(sock != OSI_NULLSOCKET); */
}
- /* not reached */
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
/* This is the server process request loop. The server process loop
/* osi_Assert(threadID != -1); */
/* osi_Assert(newcall != NULL); */
}
- /* not reached */
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
/*
#endif
rx_pthread_event_rescheduled = 0;
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
rxi_ServerProc(threadID, newcall, &sock);
/* osi_Assert(sock != OSI_NULLSOCKET); */
}
- /* not reached */
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
/* This is the server process request loop. The server process loop
/* osi_Assert(threadID != -1); */
/* osi_Assert(newcall != NULL); */
}
- /* not reached */
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
/*
}
} /* while loop */
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
/*!
}
DBRELE(ubik_dbase);
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
/*!
return lower;
}
} while(1);
- return 0;
+ AFS_UNREACHED(return(0));
}
opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
-#endif
return NULL;
+#else
+ AFS_UNREACHED(return(NULL));
+#endif
} /*FiveMinuteCheckLWP */
opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
-#endif
return NULL;
+#else
+ AFS_UNREACHED(return(NULL));
+#endif
} /*HostCheckLWP */
/* This LWP does fsync checks every 5 minutes: it should not be used for
opr_cv_broadcast(&fs_state.worker_done_cv);
FS_UNLOCK;
FS_STATE_UNLOCK;
-#endif /* AFS_DEMAND_ATTACH_FS */
return NULL;
+#else
+ AFS_UNREACHED(return(NULL));
+#endif /* !AFS_DEMAND_ATTACH_FS */
}
/*------------------------------------------------------------------------
while (1) {
sleep(1000); /* long time */
}
- return 0;
+ AFS_UNREACHED(return(0));
}
CallHandler(&FSYNC_readfds);
#endif
}
- return NULL; /* hush now, little gcc */
+ AFS_UNREACHED(return(NULL)); /* hush now, little gcc */
}
#ifdef AFS_DEMAND_ATTACH_FS
VCancelReservation_r(vp);
}
- VOL_UNLOCK;
-
- return NULL;
+ AFS_UNREACHED(VOL_UNLOCK);
+ AFS_UNREACHED(return(NULL));
}
/**
}
ReleaseReadLock(&FSYNC_handler_lock); /* just in case */
opr_abort();
- return -1; /* satisfy compiler */
+ AFS_UNREACHED(return(-1)); /* satisfy compiler */
}
static int
return i;
}
opr_abort();
- return -1; /* satisfy compiler */
+ AFS_UNREACHED(return(-1)); /* satisfy compiler */
}
static int
opr_cv_broadcast(&worker_cv);
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
static int
}
}
- opr_mutex_exit(&worker_lock);
- return NULL;
+ AFS_UNREACHED(opr_mutex_exit(&worker_lock));
+ AFS_UNREACHED(return(NULL));
}
#define LOG_XFER_BUF_SIZE 65536
CallHandler(&SALVSYNC_readfds);
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
static void
}
}
- return NULL;
+ AFS_UNREACHED(return(NULL));
}
#if defined(AFS_NT40_ENV) || defined(AFS_DARWIN160_ENV)
projects / packages / o / openafs.git / commitdiff