From a18410f02b51d400450c30d0b769b2f1e3e6736a Mon Sep 17 00:00:00 2001 From: ticktock35 Date: Mon, 15 Dec 2008 05:02:01 +0000 Subject: [PATCH 1/1] opkg: use opkg_message rather than printf in opkg_verify_file() git-svn-id: http://opkg.googlecode.com/svn/trunk@56 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358 --- libopkg/opkg_cmd.c | 2 +- libopkg/opkg_download.c | 4 ++-- libopkg/opkg_download.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c index 463b15d..5aa5dfa 100644 --- a/libopkg/opkg_cmd.c +++ b/libopkg/opkg_cmd.c @@ -277,7 +277,7 @@ static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv) opkg_message (conf, OPKG_NOTICE, "Signature check failed\n"); } else { int err; - err = opkg_verify_file (list_file_name, tmp_file_name); + err = opkg_verify_file (conf, list_file_name, tmp_file_name); if (err == 0) opkg_message (conf, OPKG_NOTICE, "Signature check passed\n"); else diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c index 25d177a..4160b97 100644 --- a/libopkg/opkg_download.c +++ b/libopkg/opkg_download.c @@ -293,7 +293,7 @@ int opkg_prepare_url_for_install(opkg_conf_t *conf, const char *url, char **name } int -opkg_verify_file (char *text_file, char *sig_file) +opkg_verify_file (opkg_conf_t *conf, char *text_file, char *sig_file) { #ifdef HAVE_GPGME int status = -1; @@ -336,7 +336,7 @@ opkg_verify_file (char *text_file, char *sig_file) return status; #else - printf ("Signature check skipped because GPG support was not enabled in this build\n"); + opkg_message (conf, OPKG_NOTICE, "Signature check for %s was skipped because GPG support was not enabled in this build\n"); return 0; #endif } diff --git a/libopkg/opkg_download.h b/libopkg/opkg_download.h index d3f419d..da65b00 100644 --- a/libopkg/opkg_download.h +++ b/libopkg/opkg_download.h @@ -27,5 +27,5 @@ int opkg_download_pkg(opkg_conf_t *conf, pkg_t *pkg, const char *dir); */ int opkg_prepare_url_for_install(opkg_conf_t *conf, const char *url, char **namep); -int opkg_verify_file (char *text_file, char *sig_file); +int opkg_verify_file (opkg_conf_t *conf, char *text_file, char *sig_file); #endif -- 2.25.1