pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/setquota Don't use NULL as 0. Fix compile er...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/737b3b19ce79
branches:  trunk
changeset: 471159:737b3b19ce79
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Mar 20 14:42:56 2004 +0000

description:
Don't use NULL as 0.  Fix compile error on gcc 3.X.

diffstat:

 sysutils/setquota/distinfo         |   4 ++--
 sysutils/setquota/patches/patch-ad |  34 +++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r 95cc50c144d5 -r 737b3b19ce79 sysutils/setquota/distinfo
--- a/sysutils/setquota/distinfo        Sat Mar 20 11:23:51 2004 +0000
+++ b/sysutils/setquota/distinfo        Sat Mar 20 14:42:56 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
+$NetBSD: distinfo,v 1.2 2004/03/20 14:42:56 taca Exp $
 
 SHA1 (setquota-0.1.tar.gz) = e7f4afa492daa10f395937f713c7b245fbcbbcdc
 Size (setquota-0.1.tar.gz) = 6300 bytes
 SHA1 (patch-aa) = 7c34c1c73dad6706e0bc94d5ff8093da20d94c5d
 SHA1 (patch-ab) = 55956d4a651919346e7b2bbcbe5caccfbba846fe
 SHA1 (patch-ac) = d4478d4292be85453abfc822b90c8dd4f6e3d997
-SHA1 (patch-ad) = 4d89b7a3440176ee456f6410cdae1b80ec58e6f9
+SHA1 (patch-ad) = 180df76af3f7bc6b46542ed48c6be8661563a15f
 SHA1 (patch-ae) = e2c5fe18291dbc38c74f83917e1bb7b207ae809c
 SHA1 (patch-af) = 15a051fc77060d9286c126bcbed8909c0a0a3b9f
diff -r 95cc50c144d5 -r 737b3b19ce79 sysutils/setquota/patches/patch-ad
--- a/sysutils/setquota/patches/patch-ad        Sat Mar 20 11:23:51 2004 +0000
+++ b/sysutils/setquota/patches/patch-ad        Sat Mar 20 14:42:56 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
+$NetBSD: patch-ad,v 1.2 2004/03/20 14:42:56 taca Exp $
 
---- quotatool.c.orig   Tue Apr  1 08:02:42 1997
+--- quotatool.c.orig   1997-04-01 08:02:42.000000000 +0900
 +++ quotatool.c
-@@ -49,15 +49,15 @@
+@@ -49,15 +49,15 @@ static const char rcsid[] =
  #include <stdlib.h>
  #include <string.h>
  #include <sys/param.h>
@@ -21,3 +21,31 @@
  u_long convert_block (char*);
  u_long convert_inode (char*);
  time_t convert_time (char*);
+@@ -267,11 +267,11 @@ convert_block(p_block)
+       char    *p_block;
+ {
+       u_long  value = 0;
+-      char    unit = NULL;
++      char    unit = 0;
+       u_long  r_blocks;
+ 
+       if (sscanf(p_block, "%lu%c", &value, &unit) != 2) {
+-              if (unit == NULL)
++              if (unit == 0)
+                       unit = 'k';
+       }
+ 
+@@ -299,11 +299,11 @@ convert_time(p_time)
+       char    *p_time;
+ {
+       u_long  value = 0;
+-      char    unit = NULL;
++      char    unit = 0;
+       time_t  r_time;
+ 
+       if (sscanf(p_time, "%ld%c", &value, &unit) != 2) {
+-              if (unit == NULL)
++              if (unit == 0)
+                       unit = 'd';
+       }
+ 



Home | Main Index | Thread Index | Old Index