# HG changeset patch # User Kristian H?gsberg # Date 1207583808 14400 # Node ID e8594c82dffc76692de008665f8c8351a7f38518 # Parent 1808497009656608c73c40a90307791c04042a95 Remove redundant curl initialization. diff -r 180849700965 -r e8594c82dffc main.c --- a/main.c Mon Apr 07 01:19:13 2008 -0400 +++ b/main.c Mon Apr 07 11:56:48 2008 -0400 @@ -544,7 +544,6 @@ struct razor_set *system, *upstream, *next; struct razor_transaction *trans; char path[PATH_MAX], new_path[PATH_MAX]; - CURL *curl; int errors, fd; /* Create the new next repo file up front to ensure exclusive @@ -584,13 +583,7 @@ razor_set_write_to_fd(next, fd); printf("wrote %s\n", new_path); - curl = curl_easy_init(); - if (curl == NULL) { - unlink(new_path); - return 1; - } - razor_set_diff(system, next, download_package, curl); - curl_easy_cleanup(curl); + razor_set_diff(system, next, download_package, NULL); /* FIXME: We need to figure out the right install order here, * so the post and pre scripts can run. */ diff -r 180849700965 -r e8594c82dffc rpm.c --- a/rpm.c Mon Apr 07 01:19:13 2008 -0400 +++ b/rpm.c Mon Apr 07 11:56:48 2008 -0400 @@ -353,7 +353,7 @@ program = razor_rpm_get_indirect(installer->rpm, program_tag, NULL); script = razor_rpm_get_indirect(installer->rpm, script_tag, NULL); if (program == NULL && script == NULL) { - return; + return 0; } else if (program == NULL) { program = "/bin/sh"; }