From owner-svn-soc-all@FreeBSD.ORG Sat Aug 31 09:40:01 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 98CC9AD0 for ; Sat, 31 Aug 2013 09:40:01 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6D0BF263E for ; Sat, 31 Aug 2013 09:40:01 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7V9e1sX046174 for ; Sat, 31 Aug 2013 09:40:01 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r7V9e1QT046169 for svn-soc-all@FreeBSD.org; Sat, 31 Aug 2013 09:40:01 GMT (envelope-from mattbw@FreeBSD.org) Date: Sat, 31 Aug 2013 09:40:01 GMT Message-Id: <201308310940.r7V9e1QT046169@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r256767 - soc2013/mattbw/backend/query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Aug 2013 09:40:01 -0000 Author: mattbw Date: Sat Aug 31 09:40:01 2013 New Revision: 256767 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256767 Log: Further factor out "emit_dependency". This is mainly for code readability reasons. Modified: soc2013/mattbw/backend/query/depends.c Modified: soc2013/mattbw/backend/query/depends.c ============================================================================== --- soc2013/mattbw/backend/query/depends.c Sat Aug 31 08:56:33 2013 (r256766) +++ soc2013/mattbw/backend/query/depends.c Sat Aug 31 09:40:01 2013 (r256767) @@ -31,6 +31,8 @@ #include "match.h" /* query_match_... */ static bool emit_dependency(struct pkg_dep *dep, PkBackend *backend, struct pkgdb *db, unsigned int load_flags); +static bool emit_found_dependency(PkBackend *backend, struct pkg *package); +static bool emit_missing_dependency(PkBackend *backend, gchar *package_id); static gchar *dep_to_package_id(struct pkg_dep *dep); static struct pkg *id_to_package(gchar *package_id, struct pkgdb *db, unsigned int load_flags); @@ -74,21 +76,37 @@ */ package = id_to_package(package_id, db, load_flags); - if (package != NULL) { - emit_package(package, backend, - pkgutils_pkg_current_state(package)); - success = true; + if (package == NULL) { + success = emit_missing_dependency(backend, package_id); } else { - success = (pk_backend_package(backend, - PK_INFO_ENUM_UNKNOWN, - package_id, - "Could not find this package.")); + success = emit_found_dependency(backend, package); } g_free(package_id); return success; } +/* Emits a dependency that has been found in the database. */ +static bool +emit_found_dependency(PkBackend *backend, struct pkg *package) +{ + + emit_package(package, backend, pkgutils_pkg_current_state(package)); + return true; +} + + +/* Emits a dependency that has not been found in the database. */ +static bool +emit_missing_dependency(PkBackend *backend, gchar *package_id) +{ + + return pk_backend_package(backend, + PK_INFO_ENUM_UNKNOWN, + package_id, + "Could not find this package."); +} + /* Attempts to match a dependency to a package. */ static struct pkg * id_to_package(gchar *package_id, struct pkgdb *db, unsigned int load_flags)