diff options
| author | jao <jao@gnu.org> | 2014-08-03 03:11:52 +0200 |
|---|---|---|
| committer | jao <jao@gnu.org> | 2014-08-03 03:11:52 +0200 |
| commit | 45ada25e46d0dfd142c85d9f0ffe98998fb59c4e (patch) | |
| tree | 236bd15af652118c7b4320fce5c8fdba9fa9c092 | |
| parent | e9ceef1491a43c990f845db27519c3c8646fc8ae (diff) | |
| download | mdk-45ada25e46d0dfd142c85d9f0ffe98998fb59c4e.tar.gz mdk-45ada25e46d0dfd142c85d9f0ffe98998fb59c4e.tar.bz2 | |
Apparently tautological comparisons fixed (bug #42871)
| -rw-r--r-- | mixgtk/mixgtk_widgets.c | 6 | ||||
| -rw-r--r-- | mixlib/mix_vm.c | 6 | ||||
| -rw-r--r-- | mixlib/xmix_vm_handlers.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/mixgtk/mixgtk_widgets.c b/mixgtk/mixgtk_widgets.c index 7e0b8dc..2bfff34 100644 --- a/mixgtk/mixgtk_widgets.c +++ b/mixgtk/mixgtk_widgets.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_widgets.c : * Implementation of the functions declared in mixgtk_widgets.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2004, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2004, 2006, 2007, 2014 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -124,7 +124,7 @@ mixgtk_widget_factory_init (void) GtkWidget * mixgtk_widget_factory_get (mixgtk_dialog_id_t dlg, mixgtk_widget_id_t widget) { - g_assert (widget < WIDGET_NO_); + g_assert ((long)widget < WIDGET_NO_); return mixgtk_widget_factory_get_child_by_name (dlg, names_[widget]); } @@ -148,5 +148,3 @@ mixgtk_widget_factory_get_child_by_name (mixgtk_dialog_id_t dlg, if (!xml_[dlg]) init_xml_ (dlg); return glade_xml_get_widget (xml_[dlg], name); } - - diff --git a/mixlib/mix_vm.c b/mixlib/mix_vm.c index d2959f2..d714bba 100644 --- a/mixlib/mix_vm.c +++ b/mixlib/mix_vm.c @@ -1,7 +1,7 @@ /* -*-c-*- ------------------ mix_vm.c : * Implementation of the functions declared in mix_vm.h * ------------------------------------------------------------------ - * Copyright (C) 2000, 2001, 2004, 2007 Free Software Foundation, Inc. + * Copyright (C) 2000, 2001, 2004, 2007, 2014 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -528,8 +528,8 @@ mix_vm_get_error_string (mix_vm_error_t code) N_("Unknow error code") }; - return errors[(code < 0 || code > MIX_VM_ERROR_UNEXPECTED) - ? MIX_VM_ERROR_UNEXPECTED + 1 : code]; + return errors[code > MIX_VM_ERROR_UNEXPECTED ? + MIX_VM_ERROR_UNEXPECTED + 1 : code]; } /* Breakpoints */ diff --git a/mixlib/xmix_vm_handlers.c b/mixlib/xmix_vm_handlers.c index a567f38..c964116 100644 --- a/mixlib/xmix_vm_handlers.c +++ b/mixlib/xmix_vm_handlers.c @@ -1377,7 +1377,7 @@ cmd_psrc_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg) gboolean cmd_pline_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg) { - gulong line = 0; + glong line = 0; const gchar *txt; if (arg && strlen (arg)) line = atoi (arg); |