From patchwork Mon Jul 16 14:02:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Wiederhake X-Patchwork-Id: 1201131 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 6CDB5E0038 for ; Mon, 16 Jul 2012 14:35:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 667E09F74D for ; Mon, 16 Jul 2012 07:35:53 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by gabe.freedesktop.org (Postfix) with SMTP id 85DBB9F707 for ; Mon, 16 Jul 2012 07:29:41 -0700 (PDT) Received: (qmail invoked by alias); 16 Jul 2012 14:03:00 -0000 Received: from host-188-174-209-55.customer.m-online.net (EHLO localhost.localdomain) [188.174.209.55] by mail.gmx.net (mp031) with SMTP; 16 Jul 2012 16:03:00 +0200 X-Authenticated: #57610014 X-Provags-ID: V01U2FsdGVkX1+EmRsLA9GEbfgd4U1QoyYgWl6QyBKDI9RTRV8lWV U/+fVWPvFBHa8l From: Tim Wiederhake To: dri-devel@lists.freedesktop.org Subject: [PATCH 7/8] Always use width in scanf Date: Mon, 16 Jul 2012 16:02:51 +0200 Message-Id: <1342447372-21742-7-git-send-email-twied@gmx.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342447372-21742-1-git-send-email-twied@gmx.net> References: <1342447372-21742-1-git-send-email-twied@gmx.net> X-Y-GMX-Trusted: 0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org --- tests/modetest/modetest.c | 8 ++++---- xf86drm.c | 8 ++++---- xf86drmMode.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index dff40d1..4540aa0 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -1215,10 +1215,10 @@ int main(int argc, char **argv) break; case 's': con_args[count].crtc = -1; - if (sscanf(optarg, "%d:%64s", + if (sscanf(optarg, "%20d:%64s", &con_args[count].id, con_args[count].mode_str) != 2 && - sscanf(optarg, "%d@%d:%64s", + sscanf(optarg, "%20d@%20d:%64s", &con_args[count].id, &con_args[count].crtc, con_args[count].mode_str) != 3) @@ -1227,12 +1227,12 @@ int main(int argc, char **argv) break; case 'P': strcpy(plane_args[plane_count].format_str, "XR24"); - if (sscanf(optarg, "%d:%dx%d@%4s", + if (sscanf(optarg, "%20d:%20dx%20d@%4s", &plane_args[plane_count].con_id, &plane_args[plane_count].w, &plane_args[plane_count].h, plane_args[plane_count].format_str) != 4 && - sscanf(optarg, "%d:%dx%d", + sscanf(optarg, "%20d:%20dx%20d", &plane_args[plane_count].con_id, &plane_args[plane_count].w, &plane_args[plane_count].h) != 3) diff --git a/xf86drm.c b/xf86drm.c index 94f634d..bcb9fbf 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -224,18 +224,18 @@ static int drmMatchBusID(const char *id1, const char *id2, int pci_domain_ok) unsigned int o2, b2, d2, f2; int ret; - ret = sscanf(id1, "pci:%04x:%02x:%02x.%u", &o1, &b1, &d1, &f1); + ret = sscanf(id1, "pci:%04x:%02x:%02x.%20u", &o1, &b1, &d1, &f1); if (ret != 4) { o1 = 0; - ret = sscanf(id1, "PCI:%u:%u:%u", &b1, &d1, &f1); + ret = sscanf(id1, "PCI:%20u:%20u:%20u", &b1, &d1, &f1); if (ret != 3) return 0; } - ret = sscanf(id2, "pci:%04x:%02x:%02x.%u", &o2, &b2, &d2, &f2); + ret = sscanf(id2, "pci:%04x:%02x:%02x.%20u", &o2, &b2, &d2, &f2); if (ret != 4) { o2 = 0; - ret = sscanf(id2, "PCI:%u:%u:%u", &b2, &d2, &f2); + ret = sscanf(id2, "PCI:%20u:%20u:%20u", &b2, &d2, &f2); if (ret != 3) return 0; } diff --git a/xf86drmMode.c b/xf86drmMode.c index 04fdf1f..31b5abd 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -693,7 +693,7 @@ int drmCheckModesettingSupported(const char *busid) struct dirent *dent; int found = 0, ret; - ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev, &func); + ret = sscanf(busid, "pci:%04x:%02x:%02x.%20d", &domain, &bus, &dev, &func); if (ret != 4) return -EINVAL;