From 28028b26b3371756811e95d894f709f4b1207c00 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 18:29:24 +0100 Subject: New upstream version 1.22.0 --- clients/cli/nmcli.h | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'clients/cli/nmcli.h') diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index cd50333a..4615b046 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -1,20 +1,6 @@ -/* nmcli - command-line tool to control NetworkManager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Copyright 2010 - 2018 Red Hat, Inc. +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2010 - 2018 Red Hat, Inc. */ #ifndef NMC_NMCLI_H @@ -149,11 +135,6 @@ typedef struct _NmCli { char *palette_buffer; /* Buffer with sequences for terminal-colors.d(5)-based coloring. */ } NmCli; -#define NMC_RETURN(nmc, rvalue) \ - G_STMT_START { \ - return ((nmc)->return_value = (rvalue)); \ - } G_STMT_END - extern NmCli nm_cli; /* Error quark for GError domain */ -- cgit 1.3.0-6-gf8a5