From patchwork Wed Apr 25 13:57:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aguirre Rodriguez, Sergio Alberto" X-Patchwork-Id: 10843 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SN2ir-0007mG-N6 for patchwork@linuxtv.org; Wed, 25 Apr 2012 15:57:33 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SN2ir-0003pG-DT; Wed, 25 Apr 2012 15:57:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758449Ab2DYN5a (ORCPT ); Wed, 25 Apr 2012 09:57:30 -0400 Received: from na3sys009aob106.obsmtp.com ([74.125.149.76]:35996 "EHLO na3sys009aog106.obsmtp.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756784Ab2DYN53 (ORCPT ); Wed, 25 Apr 2012 09:57:29 -0400 Received: from mail-ob0-f178.google.com ([209.85.214.178]) (using TLSv1) by na3sys009aob106.postini.com ([74.125.148.12]) with SMTP ID DSNKT5gCx0Di0mFF5vCATDkLsHkY0N+ZB8N5@postini.com; Wed, 25 Apr 2012 06:57:29 PDT Received: by obbwc18 with SMTP id wc18so143535obb.37 for ; Wed, 25 Apr 2012 06:57:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=5hHyDRBQ/ZABsB6AHlmPSWjAWy+7MVLXtSuPKt7DqKQ=; b=nvAHrSofDJWLbNqt9o0g42CKJ+JFO7BfxEqJFYzWO+LD1sQbEruEQIMjMfCYSoH9go 893nkzhp1mq2Va482lGUm433L6al8H1OhbiOgFG1pmqjLtOXA4Jy3cCDwIHbDvqlQPNo 5EI+JSHoMemhOQVoXi6KNLCTu3ahk8nrlbtjhQMa8eZCyDekQqlntvPJ1nnDiHsPq9Lo 2DfpPBPJRDNXpqSJPn+F/V6xnnJBdxTG8eSweq8R8vnKLv0rg7gtqszQtF93Fcu0txOy lIRuC4owkpedmj/rHb1UOUxxLSPdYuzItS15HPZKPeI7LAt2j1r0VTxUEvhbvEg3kBsT SUQg== Received: by 10.182.74.42 with SMTP id q10mr3256821obv.52.1335362246844; Wed, 25 Apr 2012 06:57:26 -0700 (PDT) Received: from localhost.localdomain (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id k7sm19587408oei.0.2012.04.25.06.57.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Apr 2012 06:57:25 -0700 (PDT) From: Sergio Aguirre To: Laurent Pinchart Cc: linux-media@vger.kernel.org, Sergio Aguirre Subject: [media-ctl PATCH] Compare entity name length aswell Date: Wed, 25 Apr 2012 08:57:13 -0500 Message-Id: <1335362233-31022-1-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQlBpRETK7sIKStVzqy1pWoxtls0iUW0DT03mNW1q9CXD/aLu4fxOW2HtpzRimYj+AfkQFP9 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.4.25.134216 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DATE_TZ_NEG_0500 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __LINES_OF_YELLING 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' Otherwise, some false positives might arise when having 2 subdevices with similar names, like: "OMAP4 ISS ISP IPIPEIF" "OMAP4 ISS ISP IPIPE" Before this patch, trying to find "OMAP4 ISS ISP IPIPE", resulted in a false entity match, retrieving "OMAP4 ISS ISP IPIPEIF" information instead. Checking length should ensure such cases are handled well. Signed-off-by: Sergio Aguirre --- src/mediactl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/mediactl.c b/src/mediactl.c index 5b8c587..451a386 100644 --- a/src/mediactl.c +++ b/src/mediactl.c @@ -66,7 +66,8 @@ struct media_entity *media_get_entity_by_name(struct media_device *media, for (i = 0; i < media->entities_count; ++i) { struct media_entity *entity = &media->entities[i]; - if (strncmp(entity->info.name, name, length) == 0) + if ((strncmp(entity->info.name, name, length) == 0) && + (strlen(entity->info.name) == length)) return entity; }