Tue Jan 7 02:15:27 2014 UTC ()
xasprintf uses format strings.


(joerg)
diff -r1.6 -r1.7 src/external/bsd/pkg_install/dist/lib/lib.h
cvs diff -r1.6 -r1.7 src/external/bsd/pkg_install/dist/lib/lib.h (expand / switch to unified diff)

--- src/external/bsd/pkg_install/dist/lib/lib.h 2010/06/26 00:17:13 1.6
+++ src/external/bsd/pkg_install/dist/lib/lib.h 2014/01/07 02:15:27 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: lib.h,v 1.6 2010/06/26 00:17:13 joerg Exp $ */ 1/* $NetBSD: lib.h,v 1.7 2014/01/07 02:15:27 joerg Exp $ */
2 2
3/* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */ 3/* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
4 4
5/* 5/*
6 * FreeBSD install - a package for the installation and maintainance 6 * FreeBSD install - a package for the installation and maintainance
7 * of non-core utilities. 7 * of non-core utilities.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -411,27 +411,27 @@ int detached_gpg_sign(const char *, size @@ -411,27 +411,27 @@ int detached_gpg_sign(const char *, size
411 const char *); 411 const char *);
412 412
413/* License handling */ 413/* License handling */
414int add_licenses(const char *); 414int add_licenses(const char *);
415int acceptable_license(const char *); 415int acceptable_license(const char *);
416int acceptable_pkg_license(const char *); 416int acceptable_pkg_license(const char *);
417void load_license_lists(void); 417void load_license_lists(void);
418 418
419/* Helper functions for memory allocation */ 419/* Helper functions for memory allocation */
420char *xstrdup(const char *); 420char *xstrdup(const char *);
421void *xrealloc(void *, size_t); 421void *xrealloc(void *, size_t);
422void *xcalloc(size_t, size_t); 422void *xcalloc(size_t, size_t);
423void *xmalloc(size_t); 423void *xmalloc(size_t);
424char *xasprintf(const char *, ...); 424char *xasprintf(const char *, ...) __printflike(1, 2);
425 425
426/* Externs */ 426/* Externs */
427extern Boolean Verbose; 427extern Boolean Verbose;
428extern Boolean Fake; 428extern Boolean Fake;
429extern Boolean Force; 429extern Boolean Force;
430extern const char *cert_chain_file; 430extern const char *cert_chain_file;
431extern const char *certs_packages; 431extern const char *certs_packages;
432extern const char *certs_pkg_vulnerabilities; 432extern const char *certs_pkg_vulnerabilities;
433extern const char *check_eol; 433extern const char *check_eol;
434extern const char *check_vulnerabilities; 434extern const char *check_vulnerabilities;
435extern const char *config_file; 435extern const char *config_file;
436extern const char *config_pkg_dbdir; 436extern const char *config_pkg_dbdir;
437extern const char *config_pkg_path; 437extern const char *config_pkg_path;