# HG changeset patch # User J. Ali Harlow # Date 1594925685 -3600 # Node ID 0121592e2512989d11a1f98a48fdf3f854e22fb0 # Parent 71127797ca73adc53ea8bc5d51a863687cd2ccc4 Fix most compiler warnings diff -r 71127797ca73 -r 0121592e2512 app-manager/applications.c --- a/app-manager/applications.c Wed Jul 15 16:04:47 2020 +0100 +++ b/app-manager/applications.c Thu Jul 16 19:54:45 2020 +0100 @@ -30,7 +30,7 @@ #ifdef WIN32 static BOOL CALLBACK plover_applications_visible_callback(HMODULE module, - const char *type,char *name,long *param) + const char *type,char *name,LONG_PTR param) { gboolean *visible=(void *)param; if (!IS_INTRESOURCE(name) && !strcmp(name,"MAINICON")) @@ -79,10 +79,12 @@ if (module) { (void)EnumResourceNamesA(module,RT_ICON, - plover_applications_visible_callback,&visible); + plover_applications_visible_callback, + (LONG_PTR)&visible); if (!visible) (void)EnumResourceNamesA(module,RT_GROUP_ICON, - plover_applications_visible_callback,&visible); + plover_applications_visible_callback, + (LONG_PTR)&visible); FreeLibrary(module); } } diff -r 71127797ca73 -r 0121592e2512 app-manager/update.c --- a/app-manager/update.c Wed Jul 15 16:04:47 2020 +0100 +++ b/app-manager/update.c Thu Jul 16 19:54:45 2020 +0100 @@ -32,7 +32,7 @@ gboolean update(const char *base) { - gchar *s,*database_uri; + gchar *s; const char *prefix; GError *error=NULL; static PloverTransactionHelper *helper=NULL; diff -r 71127797ca73 -r 0121592e2512 configure.ac --- a/configure.ac Wed Jul 15 16:04:47 2020 +0100 +++ b/configure.ac Thu Jul 16 19:54:45 2020 +0100 @@ -121,6 +121,9 @@ ################################################## # Checks for typedefs, structures, and compiler characteristics. ################################################## +AH_VERBATIM([NO_PARENTHESES], +[/* Disable warnings on parentheses even if specified in CFLAGS. */ +#pragma GCC diagnostic ignored "-Wparentheses"]) ################################################## # Checks for libraries. diff -r 71127797ca73 -r 0121592e2512 plover-gtk/transactionhelper.c --- a/plover-gtk/transactionhelper.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover-gtk/transactionhelper.c Thu Jul 16 19:54:45 2020 +0100 @@ -482,7 +482,8 @@ plover_transaction_helper_get_installed(PloverTransactionHelper *helper) { gchar *s,*saved_database_uri; - char *install_root,*local_database,*active_database,*alternate_database; + char *install_root,*local_database; + char *active_database=NULL,*alternate_database=NULL; const char *prefix; struct comps *comps; PloverPackageSet *alternate_installed,*installed; @@ -521,10 +522,8 @@ { case COMPS_DATABASE_DISTRIBUTION_LOCAL: active_database=local_database; - alternate_database=NULL; break; case COMPS_DATABASE_GLOBAL: - active_database=NULL; alternate_database=local_database; break; } @@ -725,10 +724,9 @@ plover_transaction_helper_update_summary_page(PloverTransactionHelper *helper, GError **error) { - int i,remove_count=0; + int remove_count=0; gboolean alternate_database_clashes=FALSE; gboolean active_database_is_incompatible=FALSE; - char *local_database,*active_database,*alternate_database; const char *alternate_prefix; gchar *prefix=NULL,*s; struct comps *comps=NULL; @@ -849,7 +847,8 @@ int i,count; gboolean other_packages; const char *s,*name; - enum razor_install_action action; + enum razor_install_action razor_action; + PloverTransactionHelperReportAction action; struct razor_install_iterator *ii; struct razor_set *report_set; struct razor_package *package; @@ -880,9 +879,15 @@ return FALSE; tasked_packages=plover_vector_new(); other_packages=FALSE; - while (razor_install_iterator_next(ii,&package,&action,&count)) + while (razor_install_iterator_next(ii,&package,&razor_action,&count)) { - if (action==report_action || action==RAZOR_INSTALL_ACTION_ADD && + if (razor_action==RAZOR_INSTALL_ACTION_ADD) + action=PLOVER_TRANSACTION_HELPER_REPORT_INSTALL; + else if (razor_action==RAZOR_INSTALL_ACTION_REMOVE) + action=PLOVER_TRANSACTION_HELPER_REPORT_REMOVE; + else + continue; + if (action==report_action || razor_action==RAZOR_INSTALL_ACTION_ADD && report_action==PLOVER_TRANSACTION_HELPER_REPORT_UPDATE) { razor_package_get_details(report_set,package,RAZOR_DETAIL_NAME, @@ -902,8 +907,14 @@ */ other_packages=FALSE; razor_install_iterator_rewind(ii); - while (razor_install_iterator_next(ii,&package,&action,&count)) + while (razor_install_iterator_next(ii,&package,&razor_action,&count)) { + if (razor_action==RAZOR_INSTALL_ACTION_ADD) + action=PLOVER_TRANSACTION_HELPER_REPORT_INSTALL; + else if (razor_action==RAZOR_INSTALL_ACTION_REMOVE) + action=PLOVER_TRANSACTION_HELPER_REPORT_REMOVE; + else + continue; if (action==report_action) { razor_package_get_details(report_set,package,RAZOR_DETAIL_NAME, @@ -1218,7 +1229,7 @@ const char *plover_transaction_helper_get_error(PloverTransactionHelper *helper, const GError **error) { - g_return_if_fail(PLOVER_IS_TRANSACTION_HELPER(helper)); + g_return_val_if_fail(PLOVER_IS_TRANSACTION_HELPER(helper),NULL); if (!helper->error_dialog) return NULL; if (error) diff -r 71127797ca73 -r 0121592e2512 plover/comps.c --- a/plover/comps.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/comps.c Thu Jul 16 19:54:45 2020 +0100 @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include #include #include @@ -297,6 +298,9 @@ else switch (ctx->state) { + case COMPS_STATE_BEGIN: + g_assert_not_reached(); + break; case COMPS_STATE_ROOT: ctx->group=comps_list_reverse(ctx->group); ctx->state=COMPS_STATE_BEGIN; @@ -368,6 +372,11 @@ char *str; switch (ctx->state) { + case COMPS_STATE_BEGIN: + case COMPS_STATE_ROOT: + case COMPS_STATE_GROUP: + case COMPS_STATE_GROUP_PACKAGELIST: + break; case COMPS_STATE_GROUP_ID: case COMPS_STATE_GROUP_NAME: case COMPS_STATE_GROUP_DESCRIPTION: @@ -406,9 +415,9 @@ if (XML_Parse(ctx.parser,contents,length,TRUE)==XML_STATUS_ERROR) { g_set_error(error,PLOVER_GENERAL_ERROR,PLOVER_GENERAL_ERROR_FAILED, - "%s on line %d of '%s'\n", + "%s on line %lu of '%s'\n", XML_ErrorString(XML_GetErrorCode(ctx.parser)), - XML_GetCurrentLineNumber(ctx.parser),uri); + (unsigned long)XML_GetCurrentLineNumber(ctx.parser),uri); XML_ParserFree(ctx.parser); razor_uri_free_contents(contents,length); return NULL; diff -r 71127797ca73 -r 0121592e2512 plover/import-yum.c --- a/plover/import-yum.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/import-yum.c Thu Jul 16 19:54:45 2020 +0100 @@ -337,7 +337,6 @@ const char *name,*version,*arch; void *buf; gssize len; - GFile *file; GInputStream *stream; GInputStream *primary,*filelists; GZlibDecompressor *decompressor; diff -r 71127797ca73 -r 0121592e2512 plover/inputstream.c --- a/plover/inputstream.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/inputstream.c Thu Jul 16 19:54:45 2020 +0100 @@ -21,6 +21,8 @@ #include #include #include +#include "plover/plover.h" +#include "plover/uri-handler.h" #include "plover/inputstream.h" /** diff -r 71127797ca73 -r 0121592e2512 plover/log.c --- a/plover/log.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/log.c Thu Jul 16 19:54:45 2020 +0100 @@ -32,8 +32,11 @@ #else #include #endif +#include +#include #include "config.h" #include "plover.h" +#include "uri-handler.h" #ifndef FALSE #define FALSE 0 @@ -287,12 +290,11 @@ { int retval; char *root; - gchar *s,*filename,*uri; + gchar *filename,*uri; struct stat sb; time_t t; struct tm today,modified; struct razor_atomic *atomic; - struct razor_error *error=NULL; GFile *base_file,*file; FILE *fp; plover__uri_handler_init(); diff -r 71127797ca73 -r 0121592e2512 plover/package.c --- a/plover/package.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/package.c Thu Jul 16 19:54:45 2020 +0100 @@ -53,7 +53,6 @@ static void plover_package_dispose(GObject *obj) { - PloverPackagePrivate *priv=PLOVER_PACKAGE_GET_PRIVATE(obj); G_OBJECT_CLASS(plover_package_parent_class)->dispose(obj); } diff -r 71127797ca73 -r 0121592e2512 plover/packageset.c --- a/plover/packageset.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/packageset.c Thu Jul 16 19:54:45 2020 +0100 @@ -715,7 +715,6 @@ { int len,matches=-1; const char *name; - const char *install_root; struct razor_package *package; struct razor_package_iterator *pi; struct razor_file_iterator *fi; @@ -734,7 +733,6 @@ fi=razor_file_iterator_create(priv->set,package,0); while (matches && razor_file_iterator_next(fi,&name)) { - g_message("plover_package_set_files_match_prefix(%s): %s",prefix,name); if (strncmp(name,prefix,len) || name[len]!='\0' && name[len]!='/') matches=0; diff -r 71127797ca73 -r 0121592e2512 plover/plover.h --- a/plover/plover.h Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/plover.h Thu Jul 16 19:54:45 2020 +0100 @@ -92,8 +92,12 @@ struct razor_set *system,PloverPackageSet *next,PloverRepository *upstream, struct razor_atomic *atomic,struct razor_relocations *relocations, enum razor_stage_type stage,GCancellable *cancellable); +gboolean plover_install_uri(const char *base_uri,const char *prefix,char **pkgs, + GError **error); gboolean plover_install(const char *base,const char *prefix,char **pkgs, GError **error); +gboolean plover_update_uri(const char *base_uri,const char *prefix,char **pkgs, + GError **error); gboolean plover_update(const char *base,const char *prefix,char **pkgs, GError **error); gboolean plover_remove(char **pkgs,GError **error); @@ -106,6 +110,8 @@ struct comps_group *plover_comps_lookup_group(struct comps *comps, const char *id); void plover_comps_set_vendor(struct comps *comps,const char *vendor); +void plover_comps_set_distribution(struct comps *comps, + const char *distribution); gchar *plover_comps_get_default_prefix(struct comps *comps); int plover_log_open(const char *path); diff -r 71127797ca73 -r 0121592e2512 plover/razor.c --- a/plover/razor.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/razor.c Thu Jul 16 19:54:45 2020 +0100 @@ -37,17 +37,6 @@ #define DEBUG_HOOK_RAZOR_SET /* For debugging */ #endif -static char *rpm_filename(const char *name,const char *version,const char *arch) -{ - const char *v; - v=strchr(version,':'); /* Skip epoch */ - if (v) - v++; - else - v=version; - return g_strconcat(name,"-",v,".",arch,".rpm",NULL); -} - /* * Returns 0 on success, -1 on failure and 1 if a RAZOR_INSTALL_ACTION_COMMIT * is met (in which case the action is consumed). diff -r 71127797ca73 -r 0121592e2512 plover/repository.c --- a/plover/repository.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/repository.c Thu Jul 16 19:54:45 2020 +0100 @@ -88,7 +88,6 @@ PloverRepository *repository; PloverRepositoryPrivate *priv; GFile *file; - gchar *uri; set=plover_package_set_new_from_rpms(filenames,error); if (!set) return NULL; @@ -106,17 +105,6 @@ return repository; } -static char *rpm_filename(const char *name,const char *version,const char *arch) -{ - const char *v; - v=strchr(version,':'); /* Skip epoch */ - if (v) - v++; - else - v=version; - return g_strconcat(name,"-",v,".",arch,".rpm",NULL); -} - PloverRepository *plover_repository_new_from_yum(const char *base, GError **error) { diff -r 71127797ca73 -r 0121592e2512 plover/transaction.c --- a/plover/transaction.c Wed Jul 15 16:04:47 2020 +0100 +++ b/plover/transaction.c Thu Jul 16 19:54:45 2020 +0100 @@ -24,6 +24,7 @@ #include #include "plover/transaction.h" #include "plover/plover.h" +#include "plover/uri-handler.h" G_DEFINE_TYPE(PloverTransaction,plover_transaction,G_TYPE_OBJECT); @@ -431,7 +432,6 @@ PloverPackageSet *installed; const char *root; char *install_uri; - GFile *file; gboolean retval; g_return_val_if_fail(PLOVER_IS_TRANSACTION(transaction),FALSE); if (!install_root) @@ -777,7 +777,6 @@ PloverTransaction *transaction; struct plover_vector *package_names; GList *to_remove,*lnk,*lnk2,*what_requires,*what_provides; - GFile *file; struct razor_package *package,*maybe_unused_package; struct razor_property *property; struct razor_package_query *query; diff -r 71127797ca73 -r 0121592e2512 pre-inst/post.c --- a/pre-inst/post.c Wed Jul 15 16:04:47 2020 +0100 +++ b/pre-inst/post.c Thu Jul 16 19:54:45 2020 +0100 @@ -16,6 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include #include #include @@ -94,6 +95,9 @@ else switch (ctx->state) { + case POST_STATE_BEGIN: + g_assert_not_reached(); + break; case POST_STATE_ROOT: ctx->state=POST_STATE_BEGIN; break; @@ -121,6 +125,8 @@ case POST_STATE_ARGUMENT: g_string_append_len(ctx->str,s,len); break; + default: + break; } } @@ -167,9 +173,9 @@ retval=XML_Parse(parser,contents,length,TRUE)!=XML_STATUS_ERROR; if (!retval) g_set_error(error,PLOVER_GENERAL_ERROR,PLOVER_GENERAL_ERROR_FAILED, - "%s on line %d of '%s'\n", + "%s on line %lu of '%s'\n", XML_ErrorString(XML_GetErrorCode(parser)), - XML_GetCurrentLineNumber(parser),uri); + (unsigned long)XML_GetCurrentLineNumber(parser),uri); XML_ParserFree(parser); razor_uri_free_contents(contents,length); if (retval) diff -r 71127797ca73 -r 0121592e2512 pre-inst/pre-inst.c --- a/pre-inst/pre-inst.c Wed Jul 15 16:04:47 2020 +0100 +++ b/pre-inst/pre-inst.c Thu Jul 16 19:54:45 2020 +0100 @@ -30,6 +30,7 @@ #include #include #include +#include #include #ifdef WIN32 #include @@ -662,7 +663,7 @@ if (!g_option_context_parse(context,&argc,&argv,&error)) { g_printerr("pre-install: %s\n",error->message); - g_printerr("Use \"%s --help\" for help\n",(*argv)[0]); + g_printerr("Use \"%s --help\" for help\n",argv[0]); exit(1); } if (repository && path) diff -r 71127797ca73 -r 0121592e2512 setup/setup.c --- a/setup/setup.c Wed Jul 15 16:04:47 2020 +0100 +++ b/setup/setup.c Thu Jul 16 19:54:45 2020 +0100 @@ -33,7 +33,8 @@ void setup(const char *argv0) { - char *yum_uri,*local_database,*active_database,*alternate_database; + char *yum_uri,*local_database; + char *active_database=NULL,*alternate_database=NULL; gchar *s,*prefix,*distribution,*vendor_prefix; int ch,changed; struct comps *comps; @@ -77,10 +78,8 @@ { case COMPS_DATABASE_DISTRIBUTION_LOCAL: active_database=local_database; - alternate_database=NULL; break; case COMPS_DATABASE_GLOBAL: - active_database=NULL; alternate_database=local_database; break; } diff -r 71127797ca73 -r 0121592e2512 tests/plover/test-transaction.c --- a/tests/plover/test-transaction.c Wed Jul 15 16:04:47 2020 +0100 +++ b/tests/plover/test-transaction.c Thu Jul 16 19:54:45 2020 +0100 @@ -328,8 +328,8 @@ * reference on transaction). */ delayed_quit=g_timeout_source_new_seconds(1); - g_source_set_callback(delayed_quit,g_main_loop_quit,test_commit_mainloop, - NULL); + g_source_set_callback(delayed_quit,(GSourceFunc)g_main_loop_quit, + test_commit_mainloop,NULL); g_source_attach(delayed_quit,g_main_loop_get_context(test_commit_mainloop)); g_source_unref(delayed_quit); } diff -r 71127797ca73 -r 0121592e2512 update/update.c --- a/update/update.c Wed Jul 15 16:04:47 2020 +0100 +++ b/update/update.c Thu Jul 16 19:54:45 2020 +0100 @@ -28,7 +28,8 @@ void update(const char *argv0) { - char *yum_uri,*local_database,*active_database,*alternate_database; + char *yum_uri,*local_database; + char *active_database=NULL,*alternate_database=NULL; gchar *s,*prefix,*distribution,*vendor_prefix; int ch; struct comps *comps; @@ -69,10 +70,8 @@ { case COMPS_DATABASE_DISTRIBUTION_LOCAL: active_database=local_database; - alternate_database=NULL; break; case COMPS_DATABASE_GLOBAL: - active_database=NULL; alternate_database=local_database; break; }