From patchwork Mon Oct 8 23:17:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=2E_Neusch=C3=A4fer?= X-Patchwork-Id: 1567441 Return-Path: X-Original-To: patchwork-linux-sparse@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 96DFB3FC1A for ; Mon, 8 Oct 2012 23:18:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751623Ab2JHXSk (ORCPT ); Mon, 8 Oct 2012 19:18:40 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:59886 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751148Ab2JHXSj (ORCPT ); Mon, 8 Oct 2012 19:18:39 -0400 Received: (qmail invoked by alias); 08 Oct 2012 23:18:37 -0000 Received: from dslb-084-060-229-125.pools.arcor-ip.net (EHLO debian.debian) [84.60.229.125] by mail.gmx.net (mp004) with SMTP; 09 Oct 2012 01:18:37 +0200 X-Authenticated: #41721828 X-Provags-ID: V01U2FsdGVkX18s83wrUBUsS1Y8qKlq67Ha0zOFaBQ/yjwhdOabdK UTEB8dTGFjTCeX From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= To: linux-sparse@vger.kernel.org Cc: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= , Mitesh Shah , Christopher Li , Jeff Garzik Subject: [PATCH 1/2] lib: rename die_if_error to error_happened Date: Tue, 9 Oct 2012 01:17:57 +0200 Message-Id: <1349738279-13253-1-git-send-email-j.neuschaefer@gmx.net> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org The variable in question is set when an error message is output, and doesn't control termination at all, so I think the new name matches the semantics better. Cc: Mitesh Shah Cc: Christopher Li Cc: Jeff Garzik Signed-off-by: Jonathan Neuschäfer --- lib.c | 4 ++-- lib.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib.c b/lib.c index b4d3944..1172dc2 100644 --- a/lib.c +++ b/lib.c @@ -29,7 +29,7 @@ #include "target.h" int verbose, optimize, optimize_size, preprocessing; -int die_if_error = 0; +int error_happened = 0; #ifndef __GNUC__ # define __GNUC__ 2 @@ -131,7 +131,7 @@ void warning(struct position pos, const char * fmt, ...) static void do_error(struct position pos, const char * fmt, va_list args) { static int errors = 0; - die_if_error = 1; + error_happened = 1; show_info = 1; /* Shut up warnings after an error */ max_warnings = 0; diff --git a/lib.h b/lib.h index 2cea252..7cde9c2 100644 --- a/lib.h +++ b/lib.h @@ -25,7 +25,7 @@ #endif extern int verbose, optimize, optimize_size, preprocessing; -extern int die_if_error; +extern int error_happened; extern int repeat_phase, merge_phi_sources; extern int gcc_major, gcc_minor, gcc_patchlevel;