sal/osl/unx/signal.cxx | 43 +++++++++++++++++++----------------- sw/source/core/docnode/node2lay.cxx | 4 +-- 2 files changed, 25 insertions(+), 22 deletions(-)
New commits: commit d4186da423f393f042ae98aeb5747c3fca23224b Author: Stephan Bergmann <[email protected]> AuthorDate: Mon Apr 8 07:52:38 2024 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Sep 16 22:42:39 2024 +0200 -Werror,-Wunused-but-set-variable ...ever since the code got introduced in 9dc6e2c9062725ef1f9d7e321cae5f4dbe8ca749 "sw: fix expansion of SetGetExpField in headers with split table rows" Change-Id: I44e8d375a47286b625ce9a7808484a32dc1f0aa6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165879 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit a57ade9be3aa03634933e767eab5e8fb640760ca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173404 Tested-by: Stephan Bergmann <[email protected]> diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index 607ebada8ef4..312ce2dff440 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -146,7 +146,7 @@ SwFrame const* FindNeighbourFrameForNode(SwNode const& rNode) { SwNodeIndex idx(rNode); SwFlowFrame const* pFlow(nullptr); - if (SwNode *const pNode = GoPreviousWithFrame(&idx, &pFlow)) + if (GoPreviousWithFrame(&idx, &pFlow)) { if (::CheckNodesRange(rNode, idx.GetNode(), true)) { @@ -158,7 +158,7 @@ SwFrame const* FindNeighbourFrameForNode(SwNode const& rNode) } } idx = rNode; - if (SwNode *const pNode = GoNextWithFrame(idx.GetNodes(), &idx, &pFlow)) + if (GoNextWithFrame(idx.GetNodes(), &idx, &pFlow)) { if (::CheckNodesRange(rNode, idx.GetNode(), true)) { commit 8f3437b1c0db184d7b6c5180aaa832beea2cd0ea Author: Stephan Bergmann <[email protected]> AuthorDate: Sun Mar 24 18:17:28 2024 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Sep 16 22:42:19 2024 +0200 Avoid -Werror,-Wcast-function-type-mismatch Change-Id: I93a69c57856169aeff613e34d5c0bf7fa08a0de7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165251 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 85a2bb9f52a0d834b02681344ce56e0b091e1abd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173403 Tested-by: Stephan Bergmann <[email protected]> diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx index 50c260f9d592..2e49918c71a6 100644 --- a/sal/osl/unx/signal.cxx +++ b/sal/osl/unx/signal.cxx @@ -49,14 +49,17 @@ namespace { -extern "C" using Handler1 = void (*)(int); -extern "C" using Handler2 = void (*)(int, siginfo_t *, void *); +extern "C" using Handler1_t = void (*)(int); +extern "C" using Handler2_t = void (*)(int, siginfo_t *, void *); struct SignalAction { int Signal; int Action; - Handler1 Handler; - bool siginfo; // Handler's type is Handler2 + union { + Handler1_t Handler1; + Handler2_t Handler2; + }; + bool siginfo; // Handler2 is active } Signals[] = { { SIGHUP, ACT_HIDE, SIG_DFL, false }, /* hangup */ @@ -204,13 +207,13 @@ bool onInitSignal() if (sigaction(rSignal.Signal, &ign, &oact) == 0) { rSignal.siginfo = (oact.sa_flags & SA_SIGINFO) != 0; if (rSignal.siginfo) { - rSignal.Handler = reinterpret_cast<Handler1>( - oact.sa_sigaction); + rSignal.Handler2 = + oact.sa_sigaction; } else { - rSignal.Handler = oact.sa_handler; + rSignal.Handler1 = oact.sa_handler; } } else { - rSignal.Handler = SIG_DFL; + rSignal.Handler1 = SIG_DFL; rSignal.siginfo = false; } } @@ -220,13 +223,13 @@ bool onInitSignal() if (sigaction(rSignal.Signal, &act, &oact) == 0) { rSignal.siginfo = (oact.sa_flags & SA_SIGINFO) != 0; if (rSignal.siginfo) { - rSignal.Handler = reinterpret_cast<Handler1>( - oact.sa_sigaction); + rSignal.Handler2 = + oact.sa_sigaction; } else { - rSignal.Handler = oact.sa_handler; + rSignal.Handler1 = oact.sa_handler; } } else { - rSignal.Handler = SIG_DFL; + rSignal.Handler1 = SIG_DFL; rSignal.siginfo = false; } } @@ -262,11 +265,11 @@ bool onDeInitSignal() && (bSetILLHandler || Signals[i].Signal != SIGILL))) { if (Signals[i].siginfo) { - act.sa_sigaction = reinterpret_cast<Handler2>( - Signals[i].Handler); + act.sa_sigaction = + Signals[i].Handler2; act.sa_flags = SA_SIGINFO; } else { - act.sa_handler = Signals[i].Handler; + act.sa_handler = Signals[i].Handler1; act.sa_flags = 0; } @@ -309,9 +312,9 @@ void callSystemHandler(int signal, siginfo_t * info, void * context) if (i >= NoSignals) return; - if ((Signals[i].Handler == SIG_DFL) || - (Signals[i].Handler == SIG_IGN) || - (Signals[i].Handler == SIG_ERR)) + if ((Signals[i].Handler1 == SIG_DFL) || + (Signals[i].Handler1 == SIG_IGN) || + (Signals[i].Handler1 == SIG_ERR)) { switch (Signals[i].Action) { @@ -338,10 +341,10 @@ void callSystemHandler(int signal, siginfo_t * info, void * context) } } else if (Signals[i].siginfo) { - (*reinterpret_cast<Handler2>(Signals[i].Handler))( + (*Signals[i].Handler2)( signal, info, context); } else { - (*Signals[i].Handler)(signal); + (*Signals[i].Handler1)(signal); } }
