Thu Jun 18 01:58:30 2015 UTC ()
PR 46354 Lloyd Parkes: remove unnecessary gccism for non-gcc compilers.
(dholland)
diff -r1.13 -r1.14 pkgsrc/sysutils/cfengine2/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/cfengine2/patches/patch-src_do.c
--- pkgsrc/sysutils/cfengine2/Attic/distinfo 2010/05/09 22:09:30 1.13
+++ pkgsrc/sysutils/cfengine2/Attic/distinfo 2015/06/18 01:58:30 1.14
| @@ -1,8 +1,9 @@ | | | @@ -1,8 +1,9 @@ |
| 1 | $NetBSD: distinfo,v 1.13 2010/05/09 22:09:30 pettai Exp $ | | 1 | $NetBSD: distinfo,v 1.14 2015/06/18 01:58:30 dholland Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (cfengine-2.2.10.tar.gz) = 032bec0bc59ffee7179422e96dfd902afbf94340 | | 3 | SHA1 (cfengine-2.2.10.tar.gz) = 032bec0bc59ffee7179422e96dfd902afbf94340 |
| 4 | RMD160 (cfengine-2.2.10.tar.gz) = 67fd3dc80270dc000887e3dbf26f372338e2600f | | 4 | RMD160 (cfengine-2.2.10.tar.gz) = 67fd3dc80270dc000887e3dbf26f372338e2600f |
| 5 | Size (cfengine-2.2.10.tar.gz) = 2690333 bytes | | 5 | Size (cfengine-2.2.10.tar.gz) = 2690333 bytes |
| 6 | SHA1 (patch-aa) = cdbebcf1a8d284bbaa9e8e0deb60112c5e33287c | | 6 | SHA1 (patch-aa) = cdbebcf1a8d284bbaa9e8e0deb60112c5e33287c |
| 7 | SHA1 (patch-ab) = bd2946d1cd5b21e3cf664258360c38c9651542a9 | | 7 | SHA1 (patch-ab) = bd2946d1cd5b21e3cf664258360c38c9651542a9 |
| 8 | SHA1 (patch-ac) = ca643a6dd76307053923c93b321533b684d22474 | | 8 | SHA1 (patch-ac) = ca643a6dd76307053923c93b321533b684d22474 |
| | | 9 | SHA1 (patch-src_do.c) = 5773b0b2331818b2340ab288711840073507c25b |
$NetBSD: patch-src_do.c,v 1.1 2015/06/18 01:58:30 dholland Exp $
avoid gccism (from PR 46354)
--- src/do.c~ 2009-03-08 16:27:56.000000000 +0000
+++ src/do.c
@@ -2846,7 +2846,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->n
ExpandVarstring(ptr->name,name,"");
- snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: "");
+ snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ? ptr->defines : "", ptr->elsedef ? ptr->elsedef : "");
if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
{