Wed Dec 2 12:10:38 2020 UTC ()
pkg_install: mark show_version as noreturn since it exits


(wiz)
diff -r1.70 -r1.71 pkgsrc/pkgtools/pkg_install/files/lib/lib.h
cvs diff -r1.70 -r1.71 pkgsrc/pkgtools/pkg_install/files/lib/lib.h (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/lib/lib.h 2020/07/01 10:03:20 1.70
+++ pkgsrc/pkgtools/pkg_install/files/lib/lib.h 2020/12/02 12:10:38 1.71
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: lib.h,v 1.70 2020/07/01 10:03:20 jperkin Exp $ */ 1/* $NetBSD: lib.h,v 1.71 2020/12/02 12:10:38 wiz 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
@@ -260,27 +260,27 @@ struct pkg_vulnerabilities { @@ -260,27 +260,27 @@ struct pkg_vulnerabilities {
260/* If URLlength()>0, then there is a ftp:// or http:// in the string, 260/* If URLlength()>0, then there is a ftp:// or http:// in the string,
261 * and this must be an URL. Hide this behind a more obvious name. */ 261 * and this must be an URL. Hide this behind a more obvious name. */
262#define IS_URL(str) (URLlength(str) > 0) 262#define IS_URL(str) (URLlength(str) > 0)
263 263
264#define IS_STDIN(str) ((str) != NULL && !strcmp((str), "-")) 264#define IS_STDIN(str) ((str) != NULL && !strcmp((str), "-"))
265#define IS_FULLPATH(str) ((str) != NULL && (str)[0] == '/') 265#define IS_FULLPATH(str) ((str) != NULL && (str)[0] == '/')
266 266
267/* Conflict handling (conflicts.c) */ 267/* Conflict handling (conflicts.c) */
268int some_installed_package_conflicts_with(const char *, const char *, char **, char **); 268int some_installed_package_conflicts_with(const char *, const char *, char **, char **);
269 269
270 270
271/* Prototypes */ 271/* Prototypes */
272/* Misc */ 272/* Misc */
273void show_version(void); 273void show_version(void) __attribute__ ((noreturn));
274int fexec(const char *, ...); 274int fexec(const char *, ...);
275int fexec_skipempty(const char *, ...); 275int fexec_skipempty(const char *, ...);
276int fcexec(const char *, const char *, ...); 276int fcexec(const char *, const char *, ...);
277int pfcexec(const char *, const char *, const char **); 277int pfcexec(const char *, const char *, const char **);
278 278
279/* variables file handling */ 279/* variables file handling */
280 280
281char *var_get(const char *, const char *); 281char *var_get(const char *, const char *);
282char *var_get_memory(const char *, const char *); 282char *var_get_memory(const char *, const char *);
283int var_set(const char *, const char *, const char *); 283int var_set(const char *, const char *, const char *);
284int var_copy_list(const char *, const char **); 284int var_copy_list(const char *, const char **);
285 285
286/* automatically installed as dependency */ 286/* automatically installed as dependency */