From cb1471bc69300f5203aa79b179a861c56c5c569f Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 15 May 2017 14:33:16 -0700 Subject: [PATCH] minigbm: fix typo in PRESUBMIT.cfg Now clang-format will be run everytime a committer runs repo upload with the --no-verify option. The committer will have to resolve differences, i.e: 1) add clang-format off / clang-format on. 2) change files such that clang-format does not complain. Since our version of clang-format was updated (in the LLVM ebuild), I had to resolve a few conflicts in rockchip.c and tegra.c. BUG=none TEST=none Change-Id: Ia32d3c47243957f2d674f142bda9daf7917aab0b Reviewed-on: https://chromium-review.googlesource.com/506508 Commit-Ready: Gurchetan Singh Tested-by: Gurchetan Singh Reviewed-by: Gurchetan Singh --- PRESUBMIT.cfg | 2 +- presubmit.sh | 1 - rockchip.c | 3 +-- tegra.c | 4 +--- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg index 4068b32..5dfbb4b 100644 --- a/PRESUBMIT.cfg +++ b/PRESUBMIT.cfg @@ -8,5 +8,5 @@ cros_license_check: false tab_check: false bug_field_check: false test_field_check: false -[Hooks Scripts] +[Hook Scripts] hook0 = ./presubmit.sh diff --git a/presubmit.sh b/presubmit.sh index 735b6b3..6d55f2a 100755 --- a/presubmit.sh +++ b/presubmit.sh @@ -2,7 +2,6 @@ # Copyright 2017 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - find \ '(' -name '*.[ch]' -or -name '*.cc' ')' \ -not -name 'gbm.h' \ diff --git a/rockchip.c b/rockchip.c index 45b813d..74a23d4 100644 --- a/rockchip.c +++ b/rockchip.c @@ -194,8 +194,7 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_CREATE, &gem_create); if (ret) { - fprintf(stderr, "drv: DRM_IOCTL_ROCKCHIP_GEM_CREATE failed " - "(size=%llu)\n", + fprintf(stderr, "drv: DRM_IOCTL_ROCKCHIP_GEM_CREATE failed (size=%llu)\n", gem_create.size); return ret; } diff --git a/tegra.c b/tegra.c index c2b9a6c..afdf431 100644 --- a/tegra.c +++ b/tegra.c @@ -221,9 +221,7 @@ static int tegra_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint3 ret = drmIoctl(bo->drv->fd, DRM_IOCTL_TEGRA_GEM_CREATE, &gem_create); if (ret) { - fprintf(stderr, "drv: DRM_IOCTL_TEGRA_GEM_CREATE failed " - "(size=%zu)\n", - size); + fprintf(stderr, "drv: DRM_IOCTL_TEGRA_GEM_CREATE failed (size=%zu)\n", size); return ret; }