1.1 --- a/app-manager/applications.c Wed Jul 15 16:04:47 2020 +0100
1.2 +++ b/app-manager/applications.c Thu Jul 16 19:54:45 2020 +0100
1.3 @@ -30,7 +30,7 @@
1.4
1.5 #ifdef WIN32
1.6 static BOOL CALLBACK plover_applications_visible_callback(HMODULE module,
1.7 - const char *type,char *name,long *param)
1.8 + const char *type,char *name,LONG_PTR param)
1.9 {
1.10 gboolean *visible=(void *)param;
1.11 if (!IS_INTRESOURCE(name) && !strcmp(name,"MAINICON"))
1.12 @@ -79,10 +79,12 @@
1.13 if (module)
1.14 {
1.15 (void)EnumResourceNamesA(module,RT_ICON,
1.16 - plover_applications_visible_callback,&visible);
1.17 + plover_applications_visible_callback,
1.18 + (LONG_PTR)&visible);
1.19 if (!visible)
1.20 (void)EnumResourceNamesA(module,RT_GROUP_ICON,
1.21 - plover_applications_visible_callback,&visible);
1.22 + plover_applications_visible_callback,
1.23 + (LONG_PTR)&visible);
1.24 FreeLibrary(module);
1.25 }
1.26 }
2.1 --- a/app-manager/update.c Wed Jul 15 16:04:47 2020 +0100
2.2 +++ b/app-manager/update.c Thu Jul 16 19:54:45 2020 +0100
2.3 @@ -32,7 +32,7 @@
2.4
2.5 gboolean update(const char *base)
2.6 {
2.7 - gchar *s,*database_uri;
2.8 + gchar *s;
2.9 const char *prefix;
2.10 GError *error=NULL;
2.11 static PloverTransactionHelper *helper=NULL;
3.1 --- a/configure.ac Wed Jul 15 16:04:47 2020 +0100
3.2 +++ b/configure.ac Thu Jul 16 19:54:45 2020 +0100
3.3 @@ -121,6 +121,9 @@
3.4 ##################################################
3.5 # Checks for typedefs, structures, and compiler characteristics.
3.6 ##################################################
3.7 +AH_VERBATIM([NO_PARENTHESES],
3.8 +[/* Disable warnings on parentheses even if specified in CFLAGS. */
3.9 +#pragma GCC diagnostic ignored "-Wparentheses"])
3.10
3.11 ##################################################
3.12 # Checks for libraries.
4.1 --- a/plover-gtk/transactionhelper.c Wed Jul 15 16:04:47 2020 +0100
4.2 +++ b/plover-gtk/transactionhelper.c Thu Jul 16 19:54:45 2020 +0100
4.3 @@ -482,7 +482,8 @@
4.4 plover_transaction_helper_get_installed(PloverTransactionHelper *helper)
4.5 {
4.6 gchar *s,*saved_database_uri;
4.7 - char *install_root,*local_database,*active_database,*alternate_database;
4.8 + char *install_root,*local_database;
4.9 + char *active_database=NULL,*alternate_database=NULL;
4.10 const char *prefix;
4.11 struct comps *comps;
4.12 PloverPackageSet *alternate_installed,*installed;
4.13 @@ -521,10 +522,8 @@
4.14 {
4.15 case COMPS_DATABASE_DISTRIBUTION_LOCAL:
4.16 active_database=local_database;
4.17 - alternate_database=NULL;
4.18 break;
4.19 case COMPS_DATABASE_GLOBAL:
4.20 - active_database=NULL;
4.21 alternate_database=local_database;
4.22 break;
4.23 }
4.24 @@ -725,10 +724,9 @@
4.25 plover_transaction_helper_update_summary_page(PloverTransactionHelper *helper,
4.26 GError **error)
4.27 {
4.28 - int i,remove_count=0;
4.29 + int remove_count=0;
4.30 gboolean alternate_database_clashes=FALSE;
4.31 gboolean active_database_is_incompatible=FALSE;
4.32 - char *local_database,*active_database,*alternate_database;
4.33 const char *alternate_prefix;
4.34 gchar *prefix=NULL,*s;
4.35 struct comps *comps=NULL;
4.36 @@ -849,7 +847,8 @@
4.37 int i,count;
4.38 gboolean other_packages;
4.39 const char *s,*name;
4.40 - enum razor_install_action action;
4.41 + enum razor_install_action razor_action;
4.42 + PloverTransactionHelperReportAction action;
4.43 struct razor_install_iterator *ii;
4.44 struct razor_set *report_set;
4.45 struct razor_package *package;
4.46 @@ -880,9 +879,15 @@
4.47 return FALSE;
4.48 tasked_packages=plover_vector_new();
4.49 other_packages=FALSE;
4.50 - while (razor_install_iterator_next(ii,&package,&action,&count))
4.51 + while (razor_install_iterator_next(ii,&package,&razor_action,&count))
4.52 {
4.53 - if (action==report_action || action==RAZOR_INSTALL_ACTION_ADD &&
4.54 + if (razor_action==RAZOR_INSTALL_ACTION_ADD)
4.55 + action=PLOVER_TRANSACTION_HELPER_REPORT_INSTALL;
4.56 + else if (razor_action==RAZOR_INSTALL_ACTION_REMOVE)
4.57 + action=PLOVER_TRANSACTION_HELPER_REPORT_REMOVE;
4.58 + else
4.59 + continue;
4.60 + if (action==report_action || razor_action==RAZOR_INSTALL_ACTION_ADD &&
4.61 report_action==PLOVER_TRANSACTION_HELPER_REPORT_UPDATE)
4.62 {
4.63 razor_package_get_details(report_set,package,RAZOR_DETAIL_NAME,
4.64 @@ -902,8 +907,14 @@
4.65 */
4.66 other_packages=FALSE;
4.67 razor_install_iterator_rewind(ii);
4.68 - while (razor_install_iterator_next(ii,&package,&action,&count))
4.69 + while (razor_install_iterator_next(ii,&package,&razor_action,&count))
4.70 {
4.71 + if (razor_action==RAZOR_INSTALL_ACTION_ADD)
4.72 + action=PLOVER_TRANSACTION_HELPER_REPORT_INSTALL;
4.73 + else if (razor_action==RAZOR_INSTALL_ACTION_REMOVE)
4.74 + action=PLOVER_TRANSACTION_HELPER_REPORT_REMOVE;
4.75 + else
4.76 + continue;
4.77 if (action==report_action)
4.78 {
4.79 razor_package_get_details(report_set,package,RAZOR_DETAIL_NAME,
4.80 @@ -1218,7 +1229,7 @@
4.81 const char *plover_transaction_helper_get_error(PloverTransactionHelper *helper,
4.82 const GError **error)
4.83 {
4.84 - g_return_if_fail(PLOVER_IS_TRANSACTION_HELPER(helper));
4.85 + g_return_val_if_fail(PLOVER_IS_TRANSACTION_HELPER(helper),NULL);
4.86 if (!helper->error_dialog)
4.87 return NULL;
4.88 if (error)
5.1 --- a/plover/comps.c Wed Jul 15 16:04:47 2020 +0100
5.2 +++ b/plover/comps.c Thu Jul 16 19:54:45 2020 +0100
5.3 @@ -18,6 +18,7 @@
5.4 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
5.5 */
5.6
5.7 +#include "config.h"
5.8 #include <string.h>
5.9 #include <stdio.h>
5.10 #include <errno.h>
5.11 @@ -297,6 +298,9 @@
5.12 else
5.13 switch (ctx->state)
5.14 {
5.15 + case COMPS_STATE_BEGIN:
5.16 + g_assert_not_reached();
5.17 + break;
5.18 case COMPS_STATE_ROOT:
5.19 ctx->group=comps_list_reverse(ctx->group);
5.20 ctx->state=COMPS_STATE_BEGIN;
5.21 @@ -368,6 +372,11 @@
5.22 char *str;
5.23 switch (ctx->state)
5.24 {
5.25 + case COMPS_STATE_BEGIN:
5.26 + case COMPS_STATE_ROOT:
5.27 + case COMPS_STATE_GROUP:
5.28 + case COMPS_STATE_GROUP_PACKAGELIST:
5.29 + break;
5.30 case COMPS_STATE_GROUP_ID:
5.31 case COMPS_STATE_GROUP_NAME:
5.32 case COMPS_STATE_GROUP_DESCRIPTION:
5.33 @@ -406,9 +415,9 @@
5.34 if (XML_Parse(ctx.parser,contents,length,TRUE)==XML_STATUS_ERROR)
5.35 {
5.36 g_set_error(error,PLOVER_GENERAL_ERROR,PLOVER_GENERAL_ERROR_FAILED,
5.37 - "%s on line %d of '%s'\n",
5.38 + "%s on line %lu of '%s'\n",
5.39 XML_ErrorString(XML_GetErrorCode(ctx.parser)),
5.40 - XML_GetCurrentLineNumber(ctx.parser),uri);
5.41 + (unsigned long)XML_GetCurrentLineNumber(ctx.parser),uri);
5.42 XML_ParserFree(ctx.parser);
5.43 razor_uri_free_contents(contents,length);
5.44 return NULL;
6.1 --- a/plover/import-yum.c Wed Jul 15 16:04:47 2020 +0100
6.2 +++ b/plover/import-yum.c Thu Jul 16 19:54:45 2020 +0100
6.3 @@ -337,7 +337,6 @@
6.4 const char *name,*version,*arch;
6.5 void *buf;
6.6 gssize len;
6.7 - GFile *file;
6.8 GInputStream *stream;
6.9 GInputStream *primary,*filelists;
6.10 GZlibDecompressor *decompressor;
7.1 --- a/plover/inputstream.c Wed Jul 15 16:04:47 2020 +0100
7.2 +++ b/plover/inputstream.c Thu Jul 16 19:54:45 2020 +0100
7.3 @@ -21,6 +21,8 @@
7.4 #include <razor.h>
7.5 #include <glib.h>
7.6 #include <glib/gi18n.h>
7.7 +#include "plover/plover.h"
7.8 +#include "plover/uri-handler.h"
7.9 #include "plover/inputstream.h"
7.10
7.11 /**
8.1 --- a/plover/log.c Wed Jul 15 16:04:47 2020 +0100
8.2 +++ b/plover/log.c Thu Jul 16 19:54:45 2020 +0100
8.3 @@ -32,8 +32,11 @@
8.4 #else
8.5 #include <dirent.h>
8.6 #endif
8.7 +#include <glib.h>
8.8 +#include <glib/gstdio.h>
8.9 #include "config.h"
8.10 #include "plover.h"
8.11 +#include "uri-handler.h"
8.12
8.13 #ifndef FALSE
8.14 #define FALSE 0
8.15 @@ -287,12 +290,11 @@
8.16 {
8.17 int retval;
8.18 char *root;
8.19 - gchar *s,*filename,*uri;
8.20 + gchar *filename,*uri;
8.21 struct stat sb;
8.22 time_t t;
8.23 struct tm today,modified;
8.24 struct razor_atomic *atomic;
8.25 - struct razor_error *error=NULL;
8.26 GFile *base_file,*file;
8.27 FILE *fp;
8.28 plover__uri_handler_init();
9.1 --- a/plover/package.c Wed Jul 15 16:04:47 2020 +0100
9.2 +++ b/plover/package.c Thu Jul 16 19:54:45 2020 +0100
9.3 @@ -53,7 +53,6 @@
9.4
9.5 static void plover_package_dispose(GObject *obj)
9.6 {
9.7 - PloverPackagePrivate *priv=PLOVER_PACKAGE_GET_PRIVATE(obj);
9.8 G_OBJECT_CLASS(plover_package_parent_class)->dispose(obj);
9.9 }
9.10
10.1 --- a/plover/packageset.c Wed Jul 15 16:04:47 2020 +0100
10.2 +++ b/plover/packageset.c Thu Jul 16 19:54:45 2020 +0100
10.3 @@ -715,7 +715,6 @@
10.4 {
10.5 int len,matches=-1;
10.6 const char *name;
10.7 - const char *install_root;
10.8 struct razor_package *package;
10.9 struct razor_package_iterator *pi;
10.10 struct razor_file_iterator *fi;
10.11 @@ -734,7 +733,6 @@
10.12 fi=razor_file_iterator_create(priv->set,package,0);
10.13 while (matches && razor_file_iterator_next(fi,&name))
10.14 {
10.15 - g_message("plover_package_set_files_match_prefix(%s): %s",prefix,name);
10.16 if (strncmp(name,prefix,len) ||
10.17 name[len]!='\0' && name[len]!='/')
10.18 matches=0;
11.1 --- a/plover/plover.h Wed Jul 15 16:04:47 2020 +0100
11.2 +++ b/plover/plover.h Thu Jul 16 19:54:45 2020 +0100
11.3 @@ -92,8 +92,12 @@
11.4 struct razor_set *system,PloverPackageSet *next,PloverRepository *upstream,
11.5 struct razor_atomic *atomic,struct razor_relocations *relocations,
11.6 enum razor_stage_type stage,GCancellable *cancellable);
11.7 +gboolean plover_install_uri(const char *base_uri,const char *prefix,char **pkgs,
11.8 + GError **error);
11.9 gboolean plover_install(const char *base,const char *prefix,char **pkgs,
11.10 GError **error);
11.11 +gboolean plover_update_uri(const char *base_uri,const char *prefix,char **pkgs,
11.12 + GError **error);
11.13 gboolean plover_update(const char *base,const char *prefix,char **pkgs,
11.14 GError **error);
11.15 gboolean plover_remove(char **pkgs,GError **error);
11.16 @@ -106,6 +110,8 @@
11.17 struct comps_group *plover_comps_lookup_group(struct comps *comps,
11.18 const char *id);
11.19 void plover_comps_set_vendor(struct comps *comps,const char *vendor);
11.20 +void plover_comps_set_distribution(struct comps *comps,
11.21 + const char *distribution);
11.22 gchar *plover_comps_get_default_prefix(struct comps *comps);
11.23
11.24 int plover_log_open(const char *path);
12.1 --- a/plover/razor.c Wed Jul 15 16:04:47 2020 +0100
12.2 +++ b/plover/razor.c Thu Jul 16 19:54:45 2020 +0100
12.3 @@ -37,17 +37,6 @@
12.4 #define DEBUG_HOOK_RAZOR_SET /* For debugging */
12.5 #endif
12.6
12.7 -static char *rpm_filename(const char *name,const char *version,const char *arch)
12.8 -{
12.9 - const char *v;
12.10 - v=strchr(version,':'); /* Skip epoch */
12.11 - if (v)
12.12 - v++;
12.13 - else
12.14 - v=version;
12.15 - return g_strconcat(name,"-",v,".",arch,".rpm",NULL);
12.16 -}
12.17 -
12.18 /*
12.19 * Returns 0 on success, -1 on failure and 1 if a RAZOR_INSTALL_ACTION_COMMIT
12.20 * is met (in which case the action is consumed).
13.1 --- a/plover/repository.c Wed Jul 15 16:04:47 2020 +0100
13.2 +++ b/plover/repository.c Thu Jul 16 19:54:45 2020 +0100
13.3 @@ -88,7 +88,6 @@
13.4 PloverRepository *repository;
13.5 PloverRepositoryPrivate *priv;
13.6 GFile *file;
13.7 - gchar *uri;
13.8 set=plover_package_set_new_from_rpms(filenames,error);
13.9 if (!set)
13.10 return NULL;
13.11 @@ -106,17 +105,6 @@
13.12 return repository;
13.13 }
13.14
13.15 -static char *rpm_filename(const char *name,const char *version,const char *arch)
13.16 -{
13.17 - const char *v;
13.18 - v=strchr(version,':'); /* Skip epoch */
13.19 - if (v)
13.20 - v++;
13.21 - else
13.22 - v=version;
13.23 - return g_strconcat(name,"-",v,".",arch,".rpm",NULL);
13.24 -}
13.25 -
13.26 PloverRepository *plover_repository_new_from_yum(const char *base,
13.27 GError **error)
13.28 {
14.1 --- a/plover/transaction.c Wed Jul 15 16:04:47 2020 +0100
14.2 +++ b/plover/transaction.c Thu Jul 16 19:54:45 2020 +0100
14.3 @@ -24,6 +24,7 @@
14.4 #include <glib-object.h>
14.5 #include "plover/transaction.h"
14.6 #include "plover/plover.h"
14.7 +#include "plover/uri-handler.h"
14.8
14.9 G_DEFINE_TYPE(PloverTransaction,plover_transaction,G_TYPE_OBJECT);
14.10
14.11 @@ -431,7 +432,6 @@
14.12 PloverPackageSet *installed;
14.13 const char *root;
14.14 char *install_uri;
14.15 - GFile *file;
14.16 gboolean retval;
14.17 g_return_val_if_fail(PLOVER_IS_TRANSACTION(transaction),FALSE);
14.18 if (!install_root)
14.19 @@ -777,7 +777,6 @@
14.20 PloverTransaction *transaction;
14.21 struct plover_vector *package_names;
14.22 GList *to_remove,*lnk,*lnk2,*what_requires,*what_provides;
14.23 - GFile *file;
14.24 struct razor_package *package,*maybe_unused_package;
14.25 struct razor_property *property;
14.26 struct razor_package_query *query;
15.1 --- a/pre-inst/post.c Wed Jul 15 16:04:47 2020 +0100
15.2 +++ b/pre-inst/post.c Thu Jul 16 19:54:45 2020 +0100
15.3 @@ -16,6 +16,7 @@
15.4 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
15.5 */
15.6
15.7 +#include "config.h"
15.8 #include <string.h>
15.9 #include <glib.h>
15.10 #include <expat.h>
15.11 @@ -94,6 +95,9 @@
15.12 else
15.13 switch (ctx->state)
15.14 {
15.15 + case POST_STATE_BEGIN:
15.16 + g_assert_not_reached();
15.17 + break;
15.18 case POST_STATE_ROOT:
15.19 ctx->state=POST_STATE_BEGIN;
15.20 break;
15.21 @@ -121,6 +125,8 @@
15.22 case POST_STATE_ARGUMENT:
15.23 g_string_append_len(ctx->str,s,len);
15.24 break;
15.25 + default:
15.26 + break;
15.27 }
15.28 }
15.29
15.30 @@ -167,9 +173,9 @@
15.31 retval=XML_Parse(parser,contents,length,TRUE)!=XML_STATUS_ERROR;
15.32 if (!retval)
15.33 g_set_error(error,PLOVER_GENERAL_ERROR,PLOVER_GENERAL_ERROR_FAILED,
15.34 - "%s on line %d of '%s'\n",
15.35 + "%s on line %lu of '%s'\n",
15.36 XML_ErrorString(XML_GetErrorCode(parser)),
15.37 - XML_GetCurrentLineNumber(parser),uri);
15.38 + (unsigned long)XML_GetCurrentLineNumber(parser),uri);
15.39 XML_ParserFree(parser);
15.40 razor_uri_free_contents(contents,length);
15.41 if (retval)
16.1 --- a/pre-inst/pre-inst.c Wed Jul 15 16:04:47 2020 +0100
16.2 +++ b/pre-inst/pre-inst.c Thu Jul 16 19:54:45 2020 +0100
16.3 @@ -30,6 +30,7 @@
16.4 #include <lua.h>
16.5 #include <razor.h>
16.6 #include <plover/plover.h>
16.7 +#include <plover/uri-handler.h>
16.8 #include <whelk/whelk.h>
16.9 #ifdef WIN32
16.10 #include <windows.h>
16.11 @@ -662,7 +663,7 @@
16.12 if (!g_option_context_parse(context,&argc,&argv,&error))
16.13 {
16.14 g_printerr("pre-install: %s\n",error->message);
16.15 - g_printerr("Use \"%s --help\" for help\n",(*argv)[0]);
16.16 + g_printerr("Use \"%s --help\" for help\n",argv[0]);
16.17 exit(1);
16.18 }
16.19 if (repository && path)
17.1 --- a/setup/setup.c Wed Jul 15 16:04:47 2020 +0100
17.2 +++ b/setup/setup.c Thu Jul 16 19:54:45 2020 +0100
17.3 @@ -33,7 +33,8 @@
17.4
17.5 void setup(const char *argv0)
17.6 {
17.7 - char *yum_uri,*local_database,*active_database,*alternate_database;
17.8 + char *yum_uri,*local_database;
17.9 + char *active_database=NULL,*alternate_database=NULL;
17.10 gchar *s,*prefix,*distribution,*vendor_prefix;
17.11 int ch,changed;
17.12 struct comps *comps;
17.13 @@ -77,10 +78,8 @@
17.14 {
17.15 case COMPS_DATABASE_DISTRIBUTION_LOCAL:
17.16 active_database=local_database;
17.17 - alternate_database=NULL;
17.18 break;
17.19 case COMPS_DATABASE_GLOBAL:
17.20 - active_database=NULL;
17.21 alternate_database=local_database;
17.22 break;
17.23 }
18.1 --- a/tests/plover/test-transaction.c Wed Jul 15 16:04:47 2020 +0100
18.2 +++ b/tests/plover/test-transaction.c Thu Jul 16 19:54:45 2020 +0100
18.3 @@ -328,8 +328,8 @@
18.4 * reference on transaction).
18.5 */
18.6 delayed_quit=g_timeout_source_new_seconds(1);
18.7 - g_source_set_callback(delayed_quit,g_main_loop_quit,test_commit_mainloop,
18.8 - NULL);
18.9 + g_source_set_callback(delayed_quit,(GSourceFunc)g_main_loop_quit,
18.10 + test_commit_mainloop,NULL);
18.11 g_source_attach(delayed_quit,g_main_loop_get_context(test_commit_mainloop));
18.12 g_source_unref(delayed_quit);
18.13 }
19.1 --- a/update/update.c Wed Jul 15 16:04:47 2020 +0100
19.2 +++ b/update/update.c Thu Jul 16 19:54:45 2020 +0100
19.3 @@ -28,7 +28,8 @@
19.4
19.5 void update(const char *argv0)
19.6 {
19.7 - char *yum_uri,*local_database,*active_database,*alternate_database;
19.8 + char *yum_uri,*local_database;
19.9 + char *active_database=NULL,*alternate_database=NULL;
19.10 gchar *s,*prefix,*distribution,*vendor_prefix;
19.11 int ch;
19.12 struct comps *comps;
19.13 @@ -69,10 +70,8 @@
19.14 {
19.15 case COMPS_DATABASE_DISTRIBUTION_LOCAL:
19.16 active_database=local_database;
19.17 - alternate_database=NULL;
19.18 break;
19.19 case COMPS_DATABASE_GLOBAL:
19.20 - active_database=NULL;
19.21 alternate_database=local_database;
19.22 break;
19.23 }