[gnome-applets/wip/muktupavels/werror] netspeed: fix -Wtype-limits warning
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets/wip/muktupavels/werror] netspeed: fix -Wtype-limits warning
- Date: Sat, 4 Apr 2020 20:53:40 +0000 (UTC)
commit 7fdc3ff7cb8413d562b98ebb6a31072673caf3e5
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Apr 4 21:39:33 2020 +0300
netspeed: fix -Wtype-limits warning
gnome-applets/netspeed/backend.c | 4 ++--
gnome-applets/netspeed/backend.h | 2 +-
gnome-applets/netspeed/netspeed-applet.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gnome-applets/netspeed/backend.c b/gnome-applets/netspeed/backend.c
index ab970c1b2..6e336a251 100644
--- a/gnome-applets/netspeed/backend.c
+++ b/gnome-applets/netspeed/backend.c
@@ -275,7 +275,7 @@ void
get_wireless_info (DevInfo *devinfo)
{
int fd;
- int newqual;
+ unsigned int newqual;
wireless_info info = {0};
fd = iw_sockets_open ();
@@ -304,7 +304,7 @@ get_wireless_info (DevInfo *devinfo)
newqual = info.stats.qual.qual;
}
- newqual = CLAMP(newqual, 0, 100);
+ newqual = MIN(newqual, 100);
if (devinfo->qual != newqual)
devinfo->qual = newqual;
} else {
diff --git a/gnome-applets/netspeed/backend.h b/gnome-applets/netspeed/backend.h
index 99fd5a01f..ed4468c1b 100644
--- a/gnome-applets/netspeed/backend.h
+++ b/gnome-applets/netspeed/backend.h
@@ -64,7 +64,7 @@ typedef struct
char *essid;
gboolean up, running;
guint64 tx, rx;
- int qual;
+ unsigned int qual;
char *tx_rate;
char *rx_rate;
char *sum_rate;
diff --git a/gnome-applets/netspeed/netspeed-applet.c b/gnome-applets/netspeed/netspeed-applet.c
index 2cbffc392..098d52fef 100644
--- a/gnome-applets/netspeed/netspeed-applet.c
+++ b/gnome-applets/netspeed/netspeed-applet.c
@@ -298,7 +298,7 @@ update_quality_icon(NetspeedApplet *applet)
q = (applet->devinfo.qual);
q /= 25;
- q = CLAMP(q, 0, 3); /* q out of range would crash when accessing qual_pixbufs[q] */
+ q = MIN(q, 3); /* q out of range would crash when accessing qual_pixbufs[q] */
gtk_image_set_from_pixbuf (GTK_IMAGE(applet->qual_pix), applet->qual_pixbufs[q]);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]