debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill most warnings in lib/DtTerm.

Browse Source 
Mostly missing headers, explicit parentheses and new prototypes.

Some Caveats:
* I haven't compile-tested the SVR4 getpty file, it might need another tweak
* There were operator precedence bugs in TermPrimCursor.c and TermPrimRender.c
  (^ vs. !=).  This might change behaviour, but at least I haven't experienced
  any crashes ...
* This adds a little more dependencies for include ordering, but unless we
  want to play the "headers that include headers that include headers..." game,
  this is unavoidable.
This commit is contained in:
Pascal Stumpf
2013-07-22 12:34:15 +02:00
committed by Jon Trulson
parent 8f98ac92cd
commit dc0e8ea74d
43 changed files with 437 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cde/lib/DtTerm/TermPrim/TermPrimSelect.c
View File

@@ -41,7 +41,9 @@ static char rcs_id[] = "$TOG: TermPrimSelect.c /main/6 1999/10/14 16:22:53 mgree
#include <Xm/Xm.h>
#include <Xm/AtomMgr.h>
#include <Xm/CutPaste.h>
#include <Xm/XmPrivate.h>
#include <Xm/ScrollBarP.h>
#include "TermPrimAction.h"
#include "TermPrimDebug.h"
#include "TermPrimP.h"
#include "TermPrimData.h"
@@ -51,7 +53,7 @@ static char rcs_id[] = "$TOG: TermPrimSelect.c /main/6 1999/10/14 16:22:53 mgree
#include <Xm/DropSMgr.h>
#include <Xm/DropTrans.h>
#if defined(USL)
#if defined(USL) || defined(OPENBSD_ARCHITECTURE)
#include <ctype.h>
#include <wctype.h>
#endif
@@ -1200,7 +1202,7 @@ _DtTermPrimSelectStart
selectInfo->anchor = xyToPos(tw, btnEvent->x, btnEvent->y);
if (selectInfo->scanType != XmSELECT_POSITION ||
_DtTermPrimSelectGetSelection(w, &begin, &end) && begin != end
(_DtTermPrimSelectGetSelection(w, &begin, &end) && begin != end)
)
{
_DtTermPrimSelectDoSelection(w, event, params, paramCount);
@@ -2057,7 +2059,7 @@ _DtTermPrimSelectConvert
return(False);
}
}
else if ((*target == CS_OF_LOCALE) && !isDebugFSet('s', 2) ||
else if (((*target == CS_OF_LOCALE) && !isDebugFSet('s', 2)) ||
(*target == TEXT && !isDebugFSet('s', 3)))
{
*type = CS_OF_LOCALE;
@@ -2241,8 +2243,8 @@ _DtTermPrimSelectDeleteLines
/* if there are no lines, etc. return... */
if ((len <= 0) || !selectInfo->ownPrimary ||
((tw->term.tpd->scrollLockTopRow > 0 ||
tw->term.tpd->scrollLockBottomRow < tw->term.rows-1)) &&
row < tw->term.tpd->scrollLockTopRow) {
(tw->term.tpd->scrollLockBottomRow < tw->term.rows-1)) &&
row < tw->term.tpd->scrollLockTopRow)) {
return;
}
@@ -3003,8 +3005,8 @@ XmTestInSelection(
position = xyToPos(tw, event->xbutton.x, event->xbutton.y);
if (!(_DtTermPrimSelectGetSelection(w, &left, &right) &&
left != right && (position > left && position < right)
if ((!(_DtTermPrimSelectGetSelection(w, &left, &right) &&
(left != right && (position > left && position < right)))
|| (position == left &&
event->xbutton.x > GetXFromPos(w, left))
|| (position == right &&