From patchwork Fri Aug 19 17:07:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 110699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 64C37B6F7B for ; Sat, 20 Aug 2011 03:09:32 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuSZ3-00015H-UG; Fri, 19 Aug 2011 17:09:02 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QuSZ3-0003hi-Do; Fri, 19 Aug 2011 17:09:01 +0000 Received: from mail-yi0-f49.google.com ([209.85.218.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuSZ0-0003dD-Bb for linux-mtd@lists.infradead.org; Fri, 19 Aug 2011 17:08:59 +0000 Received: by mail-yi0-f49.google.com with SMTP id 13so2669541yic.36 for ; Fri, 19 Aug 2011 10:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=CNsTsI7i1Kgza1elvgjOlk2FkuMAOr1z7zIxvPW7o6w=; b=P585e/ZKXGq8Rad2I6KYAvnf1kNnqyCZLA5s0P7nwJJWeHzpsmtKpdpLM+/NHOzlkg zbREP00Snqcy+tXQH2y9bZsjzQ4BiNaJpjAbUvEGAlh5Cc79H1MWToutDSJxGuH9d08W 8+0a+kH2HcstAQn3/lBeyWib2QIy85KZRUzAM= Received: by 10.142.200.8 with SMTP id x8mr608032wff.145.1313773737555; Fri, 19 Aug 2011 10:08:57 -0700 (PDT) Received: from localhost.localdomain (cpe-76-174-190-12.socal.res.rr.com [76.174.190.12]) by mx.google.com with ESMTPS id f8sm2467499pbk.22.2011.08.19.10.08.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Aug 2011 10:08:56 -0700 (PDT) From: Brian Norris To: Artem Bityutskiy Subject: [PATCH 03/10] mtd-utils: use __func__ instead of __FUNCTION__ Date: Fri, 19 Aug 2011 10:07:49 -0700 Message-Id: <1313773676-12879-4-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1313773676-12879-1-git-send-email-computersforpeace@gmail.com> References: <1313773676-12879-1-git-send-email-computersforpeace@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110819_130858_584242_A80E3AF8 X-CRM114-Status: GOOD ( 10.14 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.218.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (computersforpeace[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Kevin Cernekee , Brian Norris , linux-mtd@lists.infradead.org, Mike Frysinger X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org __func__ is more portable Signed-off-by: Brian Norris --- mtd_debug.c | 16 ++++++++-------- tests/ubi-tests/common.c | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mtd_debug.c b/mtd_debug.c index b98de50..2d307a9 100644 --- a/mtd_debug.c +++ b/mtd_debug.c @@ -123,10 +123,10 @@ int flash_to_file(int fd, u_int32_t offset, size_t len, const char *filename) retry: if ((buf = (u_int8_t *) malloc(size)) == NULL) { #define BUF_SIZE (64 * 1024 * sizeof(u_int8_t)) - fprintf(stderr, "%s: malloc(%#x)\n", __FUNCTION__, size); + fprintf(stderr, "%s: malloc(%#x)\n", __func__, size); if (size != BUF_SIZE) { size = BUF_SIZE; - fprintf(stderr, "%s: trying buffer size %#x\n", __FUNCTION__, size); + fprintf(stderr, "%s: trying buffer size %#x\n", __func__, size); goto retry; } perror("malloc()"); @@ -137,13 +137,13 @@ retry: size = n; err = read(fd, buf, size); if (err < 0) { - fprintf(stderr, "%s: read, size %#x, n %#x\n", __FUNCTION__, size, n); + fprintf(stderr, "%s: read, size %#x, n %#x\n", __func__, size, n); perror("read()"); goto err2; } err = write(outfd, buf, size); if (err < 0) { - fprintf(stderr, "%s: write, size %#x, n %#x\n", __FUNCTION__, size, n); + fprintf(stderr, "%s: write, size %#x, n %#x\n", __func__, size, n); perror("write()"); goto err2; } @@ -187,10 +187,10 @@ int file_to_flash(int fd, u_int32_t offset, u_int32_t len, const char *filename) } retry: if ((buf = (u_int8_t *) malloc(size)) == NULL) { - fprintf(stderr, "%s: malloc(%#x) failed\n", __FUNCTION__, size); + fprintf(stderr, "%s: malloc(%#x) failed\n", __func__, size); if (size != BUF_SIZE) { size = BUF_SIZE; - fprintf(stderr, "%s: trying buffer size %#x\n", __FUNCTION__, size); + fprintf(stderr, "%s: trying buffer size %#x\n", __func__, size); goto retry; } perror("malloc()"); @@ -201,7 +201,7 @@ retry: if (n <= size) size = n; if (fread(buf, size, 1, fp) != 1 || ferror(fp)) { - fprintf(stderr, "%s: fread, size %#x, n %#x\n", __FUNCTION__, size, n); + fprintf(stderr, "%s: fread, size %#x, n %#x\n", __func__, size, n); perror("fread()"); free(buf); fclose(fp); @@ -209,7 +209,7 @@ retry: } err = write(fd, buf, size); if (err < 0) { - fprintf(stderr, "%s: write, size %#x, n %#x\n", __FUNCTION__, size, n); + fprintf(stderr, "%s: write, size %#x, n %#x\n", __func__, size, n); perror("write()"); free(buf); fclose(fp); diff --git a/tests/ubi-tests/common.c b/tests/ubi-tests/common.c index 05cbecc..a64ea75 100644 --- a/tests/ubi-tests/common.c +++ b/tests/ubi-tests/common.c @@ -54,24 +54,24 @@ int __initial_check(const char *test, int argc, char * const argv[]) * check this. */ if (argc < 2) { - __errmsg(test, __FUNCTION__, __LINE__, + __errmsg(test, __func__, __LINE__, "UBI character device node is not specified"); return -1; } libubi = libubi_open(); if (libubi == NULL) { - __failed(test, __FUNCTION__, __LINE__, "libubi_open"); + __failed(test, __func__, __LINE__, "libubi_open"); return -1; } if (ubi_get_dev_info(libubi, argv[1], &dev_info)) { - __failed(test, __FUNCTION__, __LINE__, "ubi_get_dev_info"); + __failed(test, __func__, __LINE__, "ubi_get_dev_info"); goto close; } if (dev_info.avail_lebs < MIN_AVAIL_EBS) { - __errmsg(test, __FUNCTION__, __LINE__, + __errmsg(test, __func__, __LINE__, "insufficient available eraseblocks %d on UBI " "device, required %d", dev_info.avail_lebs, MIN_AVAIL_EBS); @@ -79,7 +79,7 @@ int __initial_check(const char *test, int argc, char * const argv[]) } if (dev_info.vol_count != 0) { - __errmsg(test, __FUNCTION__, __LINE__, + __errmsg(test, __func__, __LINE__, "device %s is not empty", argv[1]); goto close; }