summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2022-04-08 11:17:21 +0300
committerPanu Matilainen <pmatilai@redhat.com>2022-04-08 11:59:29 +0300
commitfab9eb143c8cc521ba8ee4709a647a2fd4289c43 (patch)
tree17bfae08ea7bf19602fc38b28a7dc2042ede1c60
parentbaeb71141744bb0db6bd72c580bfaf929b7b4fb2 (diff)
downloadrpm-fab9eb143c8cc521ba8ee4709a647a2fd4289c43.tar.gz
Add proper deprecation warnings to deprecated rpmsq functions
-rw-r--r--include/rpm/rpmsq.h16
-rw-r--r--rpmio/rpmsq.c1
2 files changed, 16 insertions, 1 deletions
diff --git a/include/rpm/rpmsq.h b/include/rpm/rpmsq.h
index 30466e9a8..048d9788c 100644
--- a/include/rpm/rpmsq.h
+++ b/include/rpm/rpmsq.h
@@ -14,6 +14,8 @@ extern "C" {
#endif
/** \ingroup rpmsq
+ * @deprecated Obsolete, do not use.
+ *
* Default signal handler prototype.
* @param signum signal number
* @param info (siginfo_t) signal info
@@ -29,11 +31,14 @@ typedef void (*rpmsqAction_t) (int signum, siginfo_t * info, void * context);
#define RPMSQ_ERR ((rpmsqAction_t)-1)
/** \ingroup rpmsq
+ * @deprecated Obsolete, do not use.
+ *
* Test if given signal has been caught (while signals blocked).
* Similar to sigismember() but operates on internal signal queue.
* @param signum signal to test for
* @return 1 if caught, 0 if not and -1 on error
*/
+RPM_GNUC_DEPRECATED
int rpmsqIsCaught(int signum);
/** \ingroup rpmsq
@@ -41,14 +46,18 @@ int rpmsqIsCaught(int signum);
* @param state 1 to enable, 0 to disable
* @return 0 on success, negative on error
*/
+RPM_GNUC_DEPRECATED
int rpmsqActivate(int state);
/** \ingroup rpmsq
+ * @deprecated Obsolete, do not use.
+ *
* Set or delete a signal handler for a signal.
* @param signum signal number
* @param handler signal handler or NULL to delete
* @return previous handler, RPMSQ_ERR on error
*/
+RPM_GNUC_DEPRECATED
rpmsqAction_t rpmsqSetAction(int signum, rpmsqAction_t handler);
/** \ingroup rpmsq
@@ -61,11 +70,18 @@ rpmsqAction_t rpmsqSetAction(int signum, rpmsqAction_t handler);
int rpmsqBlock(int op);
/** \ingroup rpmsq
+ * @deprecated Obsolete, do not use.
+ *
* Poll for caught signals, executing their handlers.
* @return no. active signals found
*/
+RPM_GNUC_DEPRECATED
int rpmsqPoll(void);
+/** \ingroup rpmsq
+ * @deprecated Obsolete, do not use.
+ */
+RPM_GNUC_DEPRECATED
void rpmsqSetInterruptSafety(int on);
#ifdef __cplusplus
diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index 249a204b3..51ead6934 100644
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -192,7 +192,6 @@ int rpmsqBlock(int op)
blocked--;
if (blocked == 0) {
ret = pthread_sigmask(SIG_SETMASK, &oldMask, NULL);
- rpmsqPoll();
} else if (blocked < 0) {
blocked = 0;
ret = -1;