[Dctrl-tools-devel] dctrl-tools-experimental: grep-dctrl/grep-dctrl.c: fix GET_BACKUP_FIELD for (size_t)-1 on machines where sizeof(int)!=sizeof(size_t)

Antti-Juhani Kaijanaho ajk at debian.org
Tue Apr 10 21:19:06 UTC 2007


Wed Apr 11 00:17:12 EEST 2007  Antti-Juhani Kaijanaho <ajk at debian.org>
  * grep-dctrl/grep-dctrl.c: fix GET_BACKUP_FIELD for (size_t)-1 on machines where sizeof(int) != sizeof(size_t)
diff -rN -u old-dctrl-tools-experimental/grep-dctrl/grep-dctrl.c new-dctrl-tools-experimental/grep-dctrl/grep-dctrl.c
--- old-dctrl-tools-experimental/grep-dctrl/grep-dctrl.c	2007-04-11 00:19:05.000000000 +0300
+++ new-dctrl-tools-experimental/grep-dctrl/grep-dctrl.c	2007-04-11 00:19:05.000000000 +0300
@@ -217,7 +217,7 @@
 #define IS_SHOW_FIELD(field_app_data) ((field_app_data) & 1)
 #define SET_SHOW_FIELD(field_app_data,val) \
   ((field_app_data) = ((field_app_data & ~1) | val))
-#define GET_BACKUP_FIELD(field_app_data) ((field_app_data) >> 1)
+#define GET_BACKUP_FIELD(field_app_data) (((field_app_data & ~0)) == (unsigned)-1 ? (size_t)-1 : (size_t)(field_app_data) >> 1)
 #define SET_BACKUP_FIELD(field_app_data,val) \
   ((field_app_data) = (((field_app_data)&1) | (val<<1)))
 
diff -rN -u old-dctrl-tools-experimental/tests/0006.in new-dctrl-tools-experimental/tests/0006.in
--- old-dctrl-tools-experimental/tests/0006.in	1970-01-01 02:00:00.000000000 +0200
+++ new-dctrl-tools-experimental/tests/0006.in	2007-04-11 00:19:05.000000000 +0300
@@ -0,0 +1,5 @@
+Package: abiword-plugins-gnome
+Status: purge ok not-installed
+Priority: optional
+Section: gnome
+
diff -rN -u old-dctrl-tools-experimental/tests/0006.sh new-dctrl-tools-experimental/tests/0006.sh
--- old-dctrl-tools-experimental/tests/0006.sh	1970-01-01 02:00:00.000000000 +0200
+++ new-dctrl-tools-experimental/tests/0006.sh	2007-04-11 00:19:05.000000000 +0300
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+$GREP_DCTRL -sVersion -PX abiword-plugins-gnome
\ No newline at end of file





More information about the Dctrl-tools-devel mailing list