fixes for clang, still warns a lot

This commit is contained in:
espie 2017-05-19 23:33:01 +00:00
parent dfe564c22b
commit 17a9aa136d
4 changed files with 91 additions and 0 deletions

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-bookmark_cxx,v 1.1 2017/05/19 23:33:01 espie Exp $
Index: bookmark.cxx
--- bookmark.cxx.orig
+++ bookmark.cxx
@@ -1215,7 +1215,7 @@ void BookMark::click()
{
XDrawLine(disp, Main, rgc, rwx, rwy, rwx, rwy + h);
XDrawLine(disp, Main, rgc, rwx + 1, rwy, rwx + 1, rwy + h);
- if (abs(rwx - (Mainl - l) / 2) < STICKY_CENTER)
+ if (abs(long(rwx - (Mainl - l) / 2)) < STICKY_CENTER)
rwx = (Mainl - l) / 2;
if (rwx < (Mainl - l) * MIN_PERCENT / 100)
rwx = (Mainl - l) * MIN_PERCENT / 100;
@@ -1249,7 +1249,7 @@ void BookMark::click()
{
if (cx > leftrx && cx < rightrx)
{
- if (abs(cx - (Mainl - l) / 2) < STICKY_CENTER)
+ if (abs(long(cx - (Mainl - l) / 2)) < STICKY_CENTER)
cx = (Mainl - l) / 2;
XDrawLine(disp, Main, rgc, rwx, rwy, rwx, rwy + h);
XDrawLine(disp, Main, rgc, rwx + 1, rwy, rwx + 1, rwy + h);

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-filedir_softmagic_c,v 1.1 2017/05/19 23:33:01 espie Exp $
Index: filedir/softmagic.c
--- filedir/softmagic.c.orig
+++ filedir/softmagic.c
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <sys/types.h>
@@ -285,7 +286,7 @@ struct magic *m;
#endif
t = m->offset + sizeof(time_t);
- return;
+ break;
default:
error("invalid m->type (%d) in mprint().\n", m->type);
/*NOTREACHED*/

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-plugins_aqua_aquagui_cxx,v 1.1 2017/05/19 23:33:01 espie Exp $
Index: plugins/aqua/aquagui.cxx
--- plugins/aqua/aquagui.cxx.orig
+++ plugins/aqua/aquagui.cxx
@@ -1296,7 +1296,7 @@ void AquaBookMark::click()
{
XDrawLine(disp, Main, rgc, rwx, rwy, rwx, rwy + h);
XDrawLine(disp, Main, rgc, rwx + 1, rwy, rwx + 1, rwy + h);
- if (abs(rwx - (Mainl - l) / 2) < STICKY_CENTER)
+ if (abs(long(rwx - (Mainl - l) / 2)) < STICKY_CENTER)
rwx = (Mainl - l) / 2;
if (rwx < (Mainl - l) * MIN_PERCENT / 100)
rwx = (Mainl - l) * MIN_PERCENT / 100;
@@ -1330,7 +1330,7 @@ void AquaBookMark::click()
{
if (cx > leftrx && cx < rightrx)
{
- if (abs(cx - (Mainl - l) / 2) < STICKY_CENTER)
+ if (abs(long(cx - (Mainl - l) / 2)) < STICKY_CENTER)
cx = (Mainl - l) / 2;
XDrawLine(disp, Main, rgc, rwx, rwy, rwx, rwy + h);
XDrawLine(disp, Main, rgc, rwx + 1, rwy, rwx + 1, rwy + h);

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-plugins_five_fivegui_cxx,v 1.1 2017/05/19 23:33:01 espie Exp $
Index: plugins/five/fivegui.cxx
--- plugins/five/fivegui.cxx.orig
+++ plugins/five/fivegui.cxx
@@ -2153,7 +2153,7 @@ void FiveBookMark::click()
{
XDrawLine(disp, Main, rgc, rwx, rwy, rwx, rwy + h);
XDrawLine(disp, Main, rgc, rwx + 1, rwy, rwx + 1, rwy + h);
- if (abs(rwx - (Mainl - l) / 2) < STICKY_CENTER)
+ if (abs(long(rwx - (Mainl - l) / 2)) < STICKY_CENTER)
rwx = (Mainl - l) / 2;
if (rwx < (Mainl - l) * MIN_PERCENT / 100)
rwx = (Mainl - l) * MIN_PERCENT / 100;
@@ -2187,7 +2187,7 @@ void FiveBookMark::click()
{
if (cx > leftrx && cx < rightrx)
{
- if (abs(cx - (Mainl - l) / 2) < STICKY_CENTER)
+ if (abs(long(cx - (Mainl - l) / 2)) < STICKY_CENTER)
cx = (Mainl - l) / 2;
XDrawLine(disp, Main, rgc, rwx, rwy, rwx, rwy + h);
XDrawLine(disp, Main, rgc, rwx + 1, rwy, rwx + 1, rwy + h);