Commits September 2016

commits@lists.geany.org

1 participants
80 discussions

[geany/geany] 12b9f2: Fix double escaping of markup in bold labels (oops)
by Colomban Wendling 22 Sep '16

22 Sep '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 22 Sep 2016 13:43:04 UTC Commit: 12b9f27a795f7ec8c1faf6c225314a09b6c5f7af https://github.com/geany/geany/commit/12b9f27a795f7ec8c1faf6c225314a09b6c5f… Log Message: ----------- Fix double escaping of markup in bold labels (oops) 2499b96ea1d1eb523733c95e7ec73af827b6032e fixed missing escaping of markup text, but failed to remove explicit escaping from ui_label_new_bold(), leading to dual escaping of bold labels. Modified Paths: -------------- src/ui_utils.c Modified: src/ui_utils.c 5 lines changed, 1 insertions(+), 4 deletions(-) =================================================================== @@ -2849,12 +2849,9 @@ void ui_label_set_markup(GtkLabel *label, const gchar *format, ...) GtkWidget *ui_label_new_bold(const gchar *text) { GtkWidget *label; - gchar *label_text; - label_text = g_markup_escape_text(text, -1); label = gtk_label_new(NULL); - ui_label_set_markup(GTK_LABEL(label), "<b>%s</b>", label_text); - g_free(label_text); + ui_label_set_markup(GTK_LABEL(label), "<b>%s</b>", text); return label; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d8ee2c: Fix some typos in French translation (#1227)
by Landrok 19 Sep '16

19 Sep '16

Branch: refs/heads/master Author: Landrok <landrok(a)users.noreply.github.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 19 Sep 2016 07:33:47 UTC Commit: d8ee2ccf8e4a477dd663c7966ed28c137cb00aa1 https://github.com/geany/geany/commit/d8ee2ccf8e4a477dd663c7966ed28c137cb00… Log Message: ----------- Fix some typos in French translation (#1227) Modified Paths: -------------- po/fr.po Modified: po/fr.po 52 lines changed, 26 insertions(+), 26 deletions(-) =================================================================== @@ -188,7 +188,7 @@ msgid "" "disable it if you do not need it" msgstr "" "Charger ou non l'émulateur virtuel de terminal (VTE) au lancement, " -"désactivez le si vous n'en avez pas besoin" +"désactivez-le si vous n'en avez pas besoin" #: ../data/geany.glade.h:36 msgid "Enable plugin support" @@ -715,7 +715,7 @@ msgid "" "where the compiler found a warning or an error" msgstr "" "Utilise ou non les indicateurs (un soulignage) pour mettre en avant les " -"lignes ou le compilateur a trouvé un avertissement ou une erreur" +"lignes où le compilateur a trouvé un avertissement ou une erreur" #: ../data/geany.glade.h:141 msgid "Newline strips trailing spaces" @@ -854,7 +854,7 @@ msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" -"Entrez une courte séquence de caractères prédéfinie et complétez la pour " +"Entrez une courte séquence de caractères prédéfinie et complétez-la pour " "obtenir une chaîne plus complexe en utilisant une seule touche" #: ../data/geany.glade.h:169 @@ -939,7 +939,7 @@ msgid "" msgstr "" "Délai minimum (en millisecondes) entre deux mises à jour automatiques de la " "liste de symboles. Un délai trop court peut avoir un impact sur les " -"performances, en particulier avec de gros fichiers. Un délai de 0 désactives " +"performances, en particulier avec de gros fichiers. Un délai de 0 désactive " "les mises à jour automatiques." #: ../data/geany.glade.h:185 @@ -1198,7 +1198,7 @@ msgstr "Encodage par défaut (nouveaux fichiers) :" #: ../data/geany.glade.h:238 msgid "Sets the default encoding for newly created files" msgstr "" -"Définit le jeu de caractères utilisés par défaut lors de la création de " +"Définit le jeu de caractères utilisé par défaut lors de la création de " "nouveaux fichiers" #: ../data/geany.glade.h:239 @@ -1247,7 +1247,7 @@ msgid "" "mixed line endings in the same file" msgstr "" "S'assurer de toujours convertir les fins de lignes avant un enregistrement " -"pour éviter les fins de lignes mixtes dans un même fichier" +"pour éviter les fins de ligne mixtes dans un même fichier" #: ../data/geany.glade.h:248 msgid "Strip trailing spaces and tabs" @@ -1471,7 +1471,7 @@ msgstr "Afficher les numéros de ligne" #: ../data/geany.glade.h:296 ../src/printing.c:241 msgid "Add line numbers to the printed page" -msgstr "Ajouter les numéros de lignes à la page imprimée" +msgstr "Ajouter les numéros de ligne à la page imprimée" #: ../data/geany.glade.h:297 ../src/printing.c:244 msgid "Print page numbers" @@ -1913,7 +1913,7 @@ msgstr "Afficher les e_spaces" #: ../data/geany.glade.h:397 msgid "Show Line _Endings" -msgstr "Afficher les fins d_e lignes" +msgstr "Afficher les fins d_e ligne" #: ../data/geany.glade.h:398 msgid "Show Indentation _Guides" @@ -2021,7 +2021,7 @@ msgstr "Définir l'_encodage" #: ../data/geany.glade.h:424 msgid "Set Line E_ndings" -msgstr "Définir les fi_ns de lignes" +msgstr "Définir les fi_ns de ligne" #: ../data/geany.glade.h:425 msgid "Convert and Set to _CR/LF (Windows)" @@ -2202,7 +2202,7 @@ msgid "" "Space separated list of file patterns used for the find in files dialog (e." "g. *.c *.h)" msgstr "" -"Liste de motifs de fichier, séparés par une espace, à utiliser dans le " +"Liste de motifs de fichier, séparés par un espace, à utiliser dans le " "dialogue de recherche dans les fichiers (par ex. *.c *.h)" #: ../data/geany.glade.h:469 ../src/project.c:209 @@ -2360,7 +2360,7 @@ msgstr "Contributeurs" msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -"Quelques uns des principaux contributeurs (pour une liste plus détaillé, " +"Quelques uns des principaux contributeurs (pour une liste plus détaillée, " "voir le fichier %s) :" #: ../src/about.c:407 @@ -2664,7 +2664,7 @@ msgid "" "Note if you choose multiple files, they will all be opened with the chosen " "encoding." msgstr "" -"Définit explicitement un encodage pour le fichier, si celui-ci ne serait pas " +"Définit explicitement un encodage pour le fichier, si celui-ci n'était pas " "détecté. Cela est utile lorsque vous savez que l'encodage d'un fichier ne " "peut pas être détecté correctement par Geany.\n" "Notez que si vous choisissez plusieurs fichiers, ils seront tous ouverts " @@ -2684,7 +2684,7 @@ msgid "" msgstr "" "Définit explicitement un type de fichier pour ce fichier, s'il n'est pas " "détecté par l'extension du nom de fichier.\n" -"Notez que si vous choisissez plusieurs fichier, ils seront tous ouverts avec " +"Notez que si vous choisissez plusieurs fichiers, ils seront tous ouverts avec " "le type de fichier choisi." #: ../src/dialogs.c:377 ../src/dialogs.c:467 @@ -3501,11 +3501,11 @@ msgstr "Diminuer l'indentation" #: ../src/keybindings.c:469 msgid "Increase indent by one space" -msgstr "Augmenter l'indentation d'une espace" +msgstr "Augmenter l'indentation d'un espace" #: ../src/keybindings.c:471 msgid "Decrease indent by one space" -msgstr "Diminuer l'indentation d'une espace" +msgstr "Diminuer l'indentation d'un espace" #: ../src/keybindings.c:475 msgid "Send to Custom Command 1" @@ -3828,7 +3828,7 @@ msgstr "Les raccourcis clavier suivants peuvent être configurés :" #: ../src/keyfile.c:1027 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" -"Écrivez ici ce que vous souhaitez, utilisez cela comme comme un tableau de " +"Écrivez ici ce que vous souhaitez, utilisez cela comme un tableau de " "notes" #: ../src/keyfile.c:1254 @@ -4412,7 +4412,7 @@ msgid "" msgstr "" "Tester la correspondance des expressions régulières sur tout le tampon d'un " "coup plutôt que ligne à ligne, ce qui permet aux correspondances de " -"recouvrir plusieurs lignes. Dans ce mode les caractères de fin de ligne " +"recouvrir plusieurs lignes. Dans ce mode, les caractères de fin de ligne " "peuvent être capturés comme n'importe quel caractère." #: ../src/search.c:341 @@ -4517,7 +4517,7 @@ msgstr "" "Tous : recherche dans tous les fichiers\n" "Projet : utilise les motifs de fichier définis dans les propriétés du " "projet\n" -"Personnalisé : utilise les motifs de fichiers spécifiés manuellement" +"Personnalisé : utilise les motifs de fichier spécifiés manuellement" #: ../src/search.c:896 msgid "Fi_les:" @@ -4565,8 +4565,8 @@ msgstr "Autres options à passer à grep" #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." -msgstr[0] "%d correspondances trouvées pour « %s »." -msgstr[1] "%d correspondance trouvée pour « %s »." +msgstr[0] "%d correspondance trouvée pour « %s »." +msgstr[1] "%d correspondances trouvées pour « %s »." #: ../src/search.c:1425 #, c-format @@ -4632,7 +4632,7 @@ msgid "" msgstr "" "Geany a essayé d'accéder au socket de domaine Unix d'une autre instance d'un " "autre utilisateur.\n" -"Ceci est une erreur fatale et Geany va maintenant fermer." +"Ceci est une erreur fatale et Geany va maintenant se fermer." #: ../src/spawn.c:94 ../src/spawn.c:144 ../src/spawn.c:188 msgid "Text ended before matching quote was found" @@ -4984,7 +4984,7 @@ msgstr "Extension de fichier inconnue pour « %s ».\n" #, c-format msgid "Failed to create tags file, perhaps because no symbols were found.\n" msgstr "" -"Échec à la création du fichier de tags, probablement par ce qu'aucun symbole " +"Échec à la création du fichier de tags, probablement parce qu'aucun symbole " "n'a été trouvé.\n" #: ../src/symbols.c:1619 @@ -5239,7 +5239,7 @@ msgid "" "The executed custom command returned an error. Your selection was not " "changed. Error message: %s" msgstr "" -"La commande personnalisée a retournée une erreur. Votre sélection n'a pas " +"La commande personnalisée a retourné une erreur. Votre sélection n'a pas " "été modifiée. Message d'erreur : %s" #: ../src/tools.c:233 @@ -5487,7 +5487,7 @@ msgid "" "another one." msgstr "" "Impossible d'appeler la commande configurée pour le navigateur. Corrigez-la " -"ou entrez en une différente." +"ou entrez-en une différente." #: ../src/utils.c:375 msgid "Windows (CRLF)" @@ -5875,7 +5875,7 @@ msgid "" "Filter your files with the usual wildcards. Separate multiple patterns with " "a space." msgstr "" -"Filtre vos fichiers avec vos jokers habituels. Séparez chaque motif par une " +"Filtre vos fichiers avec vos jokers habituels. Séparez chaque motif par un " "espace." #: ../plugins/filebrowser.c:1164 @@ -6363,7 +6363,7 @@ msgstr "En haut et en bas" #~ msgid "Set programs and options for compiling and viewing (La)TeX files." #~ msgstr "" -#~ "Définir les programmes et options utilisées pour compiler et visionner " +#~ "Définir les programmes et options utilisés pour compiler et visionner " #~ "les fichiers (La)Tex." #~ msgid "DVI creation:" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2a2ae7: Merge pull request #1166 from eht16/fix_template_error_message
by Enrico Tröger 11 Sep '16

11 Sep '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 11 Sep 2016 09:12:18 UTC Commit: 2a2ae728341d12b7cea29b671beb08e441f62d95 https://github.com/geany/geany/commit/2a2ae728341d12b7cea29b671beb08e441f62… Log Message: ----------- Merge pull request #1166 from eht16/fix_template_error_message Improve template command error message Modified Paths: -------------- src/templates.c Modified: src/templates.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -615,8 +615,9 @@ static gchar *run_command(const gchar *command, const gchar *file_name, } else { - g_warning(_("Cannot execute command \"%s\" from the template: %s. " - "Check the path in the template."), command, error->message); + g_warning(_("Cannot execute template command \"%s\". " + "Hint: incorrect paths in the command are a common cause of errors. " + "Error: %s."), command, error->message); g_error_free(error); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6bc43f: Merge pull request #1203 from codebrainz/document-data
by Matthew Brush 11 Sep '16

11 Sep '16

Branch: refs/heads/master Author: Matthew Brush <mbrush(a)codebrainz.ca> Committer: GitHub <noreply(a)github.com> Date: Sun, 11 Sep 2016 02:40:38 UTC Commit: 6bc43f745e27a45a7fd1b981ca452e8b97929c0e https://github.com/geany/geany/commit/6bc43f745e27a45a7fd1b981ca452e8b97929… Log Message: ----------- Merge pull request #1203 from codebrainz/document-data Document data Modified Paths: -------------- src/document.c src/document.h src/documentprivate.h src/plugins.c src/pluginutils.c src/pluginutils.h Modified: src/document.c 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -657,6 +657,8 @@ static GeanyDocument *document_create(const gchar *utf8_filename) doc->priv->last_check = time(NULL); #endif + g_datalist_init(&doc->priv->data); + sidebar_openfiles_add(doc); /* sets doc->iter */ notebook_new_tab(doc); @@ -712,6 +714,8 @@ static gboolean remove_page(guint page_num) if (! main_status.closing_all && doc->real_path != NULL) ui_add_recent_document(doc); + g_datalist_clear(&doc->priv->data); + doc->is_valid = FALSE; doc->id = 0; @@ -3839,3 +3843,22 @@ GEANY_API_SYMBOL GType document_get_type (void); G_DEFINE_BOXED_TYPE(GeanyDocument, document, copy_, free_); + + +gpointer document_get_data(const GeanyDocument *doc, const gchar *key) +{ + return g_datalist_get_data(&doc->priv->data, key); +} + + +void document_set_data(GeanyDocument *doc, const gchar *key, gpointer data) +{ + g_datalist_set_data(&doc->priv->data, key, data); +} + + +void document_set_data_full(GeanyDocument *doc, const gchar *key, + gpointer data, GDestroyNotify free_func) +{ + g_datalist_set_data_full(&doc->priv->data, key, data, free_func); +} Modified: src/document.h 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -316,6 +316,13 @@ void document_grab_focus(GeanyDocument *doc); GeanyDocument *document_clone(GeanyDocument *old_doc); +gpointer document_get_data(const GeanyDocument *doc, const gchar *key); + +void document_set_data(GeanyDocument *doc, const gchar *key, gpointer data); + +void document_set_data_full(GeanyDocument *doc, const gchar *key, + gpointer data, GDestroyNotify free_func); + #endif /* GEANY_PRIVATE */ G_END_DECLS Modified: src/documentprivate.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -111,6 +111,8 @@ typedef struct GeanyDocumentPrivate gint protected; /* Save pointer to info bars allowing to cancel them programatically (to avoid multiple ones) */ GtkWidget *info_bars[NUM_MSG_TYPES]; + /* Keyed Data List to attach arbitrary data to the document */ + GData *data; } GeanyDocumentPrivate; Modified: src/plugins.c 39 lines changed, 39 insertions(+), 0 deletions(-) =================================================================== @@ -31,6 +31,7 @@ #include "app.h" #include "dialogs.h" +#include "documentprivate.h" #include "encodings.h" #include "geanyobject.h" #include "geanywraplabel.h" @@ -59,6 +60,14 @@ #include <string.h> +typedef struct +{ + gchar *prefix; + GeanyDocument *document; +} +ForEachDocData; + + GList *active_plugin_list = NULL; /* list of only actually loaded plugins, always valid */ @@ -850,6 +859,35 @@ static gboolean is_active_plugin(Plugin *plugin) } +static void remove_each_doc_data(GQuark key_id, gpointer data, gpointer user_data) +{ + const ForEachDocData *doc_data = user_data; + const gchar *key = g_quark_to_string(key_id); + if (g_str_has_prefix(key, doc_data->prefix)) + g_datalist_remove_data(&doc_data->document->priv->data, key); +} + + +static void remove_doc_data(Plugin *plugin) +{ + ForEachDocData data; + + data.prefix = g_strdup_printf("geany/plugins/%s/", plugin->public.info->name); + + for (guint i = 0; i < documents_array->len; i++) + { + GeanyDocument *doc = documents_array->pdata[i]; + if (DOC_VALID(doc)) + { + data.document = doc; + g_datalist_foreach(&doc->priv->data, remove_each_doc_data, &data); + } + } + + g_free(data.prefix); +} + + /* Clean up anything used by an active plugin */ static void plugin_cleanup(Plugin *plugin) @@ -859,6 +897,7 @@ plugin_cleanup(Plugin *plugin) /* With geany_register_plugin cleanup is mandatory */ plugin->cbs.cleanup(&plugin->public, plugin->cb_data); + remove_doc_data(plugin); remove_callbacks(plugin); remove_sources(plugin); Modified: src/pluginutils.c 153 lines changed, 153 insertions(+), 0 deletions(-) =================================================================== @@ -44,6 +44,14 @@ #include "utils.h" +typedef struct +{ + gpointer data; + GDestroyNotify free_func; +} +PluginDocDataProxy; + + /** Inserts a toolbar item before the Quit button, or after the previous plugin toolbar item. * A separator is added on the first call to this function, and will be shown when @a item is * shown; hidden when @a item is hidden. @@ -599,4 +607,149 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer pdata, GDestroyNotify f } +static void plugin_doc_data_proxy_free(gpointer pdata) +{ + PluginDocDataProxy *prox = pdata; + if (prox != NULL) + { + if (prox->free_func) + prox->free_func(prox->data); + g_slice_free(PluginDocDataProxy, prox); + } +} + + +/** + * Retrieve plugin-specific data attached to a document. + * + * @param plugin The plugin who attached the data. + * @param doc The document which the data was attached to. + * @param key The key name of the attached data. + * + * @return The attached data pointer or `NULL` if the key is not found + * for the given plugin. + * + * @since 1.29 (Plugin API 228) + * @see plugin_set_document_data plugin_set_document_data_full + */ +GEANY_API_SYMBOL +gpointer plugin_get_document_data(struct GeanyPlugin *plugin, + struct GeanyDocument *doc, const gchar *key) +{ + gchar *real_key; + PluginDocDataProxy *data; + + g_return_val_if_fail(plugin != NULL, NULL); + g_return_val_if_fail(doc != NULL, NULL); + g_return_val_if_fail(key != NULL && *key != '\0', NULL); + + real_key = g_strdup_printf("geany/plugins/%s/%s", plugin->info->name, key); + data = document_get_data(doc, real_key); + g_free(real_key); + + return (data != NULL) ? data->data : NULL; +} + + +/** + * Attach plugin-specific data to a document. + * + * @param plugin The plugin attaching data to the document. + * @param doc The document to attach the data to. + * @param key The key name for the data. + * @param data The pointer to attach to the document. + * + * @since 1.29 (Plugin API 228) + * @see plugin_get_document_data plugin_set_document_data_full + */ +GEANY_API_SYMBOL +void plugin_set_document_data(struct GeanyPlugin *plugin, struct GeanyDocument *doc, + const gchar *key, gpointer data) +{ + plugin_set_document_data_full(plugin, doc, key, data, NULL); +} + + +/** + * Attach plugin-specific data and a free function to a document. + * + * This is useful for plugins who want to keep some additional data with + * the document and even have it auto-released appropriately (see below). + * + * This is a simple example showing how a plugin might use this to + * attach a string to each document and print it when the document is + * saved: + * + * @code + * void on_document_open(GObject *unused, GeanyDocument *doc, GeanyPlugin *plugin) + * { + * plugin_set_document_data_full(plugin, doc, "my-data", + * g_strdup("some-data"), g_free); + * } + * + * void on_document_save(GObject *unused, GeanyDocument *doc, GeanyPlugin *plugin) + * { + * const gchar *some_data = plugin_get_document_data(plugin, doc, "my-data"); + * g_print("my-data: %s", some_data); + * } + * + * gboolean plugin_init(GeanyPlugin *plugin, gpointer unused) + * { + * plugin_signal_connect(plugin, NULL, "document-open", TRUE, + * G_CALLBACK(on_document_open), plugin); + * plugin_signal_connect(plugin, NULL, "document-new", TRUE, + * G_CALLBACK(on_document_open), plugin); + * plugin_signal_connect(plugin, NULL, "document-save", TRUE, + * G_CALLBACK(on_document_save), plugin); + * return TRUE; + * } + * + * void geany_load_module(GeanyPlugin *plugin) + * { + * // ... + * plugin->funcs->init = plugin_init; + * // ... + * } + * @endcode + * + * The @a free_func can be used to tie the lifetime of the data to that + * of the @a doc and/or the @a plugin. The @a free_func will be called + * in any of the following cases: + * + * - When a document is closed. + * - When the plugin is unloaded. + * - When the document data is set again using the same key. + * + * @param plugin The plugin attaching data to the document. + * @param doc The document to attach the data to. + * @param key The key name for the data. + * @param data The pointer to attach to the document. + * @param free_func The function to call with data when removed. + * + * @since 1.29 (Plugin API 228) + * @see plugin_get_document_data plugin_set_document_data + */ +GEANY_API_SYMBOL +void plugin_set_document_data_full(struct GeanyPlugin *plugin, + struct GeanyDocument *doc, const gchar *key, gpointer data, + GDestroyNotify free_func) +{ + PluginDocDataProxy *prox; + + g_return_if_fail(plugin != NULL); + g_return_if_fail(doc != NULL); + g_return_if_fail(key != NULL); + + prox = g_slice_new(PluginDocDataProxy); + if (prox != NULL) + { + gchar *real_key = g_strdup_printf("geany/plugins/%s/%s", plugin->info->name, key); + prox->data = data; + prox->free_func = free_func; + document_set_data_full(doc, real_key, prox, plugin_doc_data_proxy_free); + g_free(real_key); + } +} + + #endif Modified: src/pluginutils.h 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -33,6 +33,7 @@ G_BEGIN_DECLS /* avoid including plugindata.h otherwise this redefines the GEANY() macro */ struct GeanyPlugin; +struct GeanyDocument; void plugin_add_toolbar_item(struct GeanyPlugin *plugin, GtkToolItem *item); @@ -62,6 +63,16 @@ void plugin_show_configure(struct GeanyPlugin *plugin); void plugin_builder_connect_signals(struct GeanyPlugin *plugin, GtkBuilder *builder, gpointer user_data); +gpointer plugin_get_document_data(struct GeanyPlugin *plugin, + struct GeanyDocument *doc, const gchar *key); + +void plugin_set_document_data(struct GeanyPlugin *plugin, struct GeanyDocument *doc, + const gchar *key, gpointer data); + +void plugin_set_document_data_full(struct GeanyPlugin *plugin, + struct GeanyDocument *doc, const gchar *key, gpointer data, + GDestroyNotify free_func); + G_END_DECLS #endif /* HAVE_PLUGINS */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cc18dd: Gracefully handle proxies registering invalid extensions (#1212)
by Matthew Brush 11 Sep '16

11 Sep '16

Branch: refs/heads/master Author: Matthew Brush <mbrush(a)codebrainz.ca> Committer: GitHub <noreply(a)github.com> Date: Sun, 11 Sep 2016 02:24:16 UTC Commit: cc18dd0e60938141bc702ed3da3218e1144de2a4 https://github.com/geany/geany/commit/cc18dd0e60938141bc702ed3da3218e1144de… Log Message: ----------- Gracefully handle proxies registering invalid extensions (#1212) It is very hard to debug if the proxy plugin happens to give extensions starting with a dot. If they do, detect this case, warn in the debug messages, and fix the extension. It seems unlikely that files with two dot extensions will be desired, so it should case no harm. Modified Paths: -------------- src/plugins.c Modified: src/plugins.c 14 lines changed, 13 insertions(+), 1 deletions(-) =================================================================== @@ -1966,6 +1966,18 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data) } +static const gchar *fix_extension(const gchar *ext) +{ + if (*ext == '.') + { + g_warning(_("Proxy plugin extension '%s' starts with a dot, " + "stripping. Please fix your proxy plugin."), ext); + ext++; + } + return ext; +} + + /** Register the plugin as a proxy for other plugins * * Proxy plugins register a list of file extensions and a set of callbacks that are called @@ -2017,7 +2029,7 @@ gboolean geany_plugin_register_proxy(GeanyPlugin *plugin, const gchar **extensio foreach_strv(ext, extensions) { proxy = g_new(PluginProxy, 1); - g_strlcpy(proxy->extension, *ext, sizeof(proxy->extension)); + g_strlcpy(proxy->extension, fix_extension(*ext), sizeof(proxy->extension)); proxy->plugin = p; /* prepend, so that plugins automatically override core providers for a given extension */ g_queue_push_head(&active_proxies, proxy); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7d172c: Improve GeanyProxyProbeResults a litte (#1213)
by Matthew Brush 11 Sep '16

11 Sep '16

Branch: refs/heads/master Author: Matthew Brush <mbrush(a)codebrainz.ca> Committer: GitHub <noreply(a)github.com> Date: Sun, 11 Sep 2016 02:18:10 UTC Commit: 7d172ceeb3b024c6d206758a0b80631c0b935590 https://github.com/geany/geany/commit/7d172ceeb3b024c6d206758a0b80631c0b935… Log Message: ----------- Improve GeanyProxyProbeResults a litte (#1213) * Add GEANY_ prefix to enumerators. * Use a discrete set of enumerators so the proxy doesn't have to worry about flag bitmasks, which isn't required. * Update documentation. * Use the new enumerators in Geany. * Improve debug output for bogus values a bit. Modified Paths: -------------- doc/plugins.dox plugins/demoproxy.c src/plugindata.h src/plugins.c Modified: doc/plugins.dox 13 lines changed, 6 insertions(+), 7 deletions(-) =================================================================== @@ -768,9 +768,8 @@ done in the GeanyPluginFuncs::init function of the proxy plugin. - GeanyProxyFuncs::probe may be implemented to probe if a plugin candidate (that has one of the provided file extensions) is actually a plugin. This may depend on the plugin file itself in case of ambiguity or availability of runtime dependencies or even configuration. - @ref PROXY_IGNORED or @ref PROXY_MATCHED should be returned, possibly in combination - with the @ref PROXY_NOLOAD flag. Not implementing GeanyProxyFuncs::probe at all is equivalent to - always returning @ref PROXY_MATCHED. + @ref GeanyProxyProbeResults constants should be returned. Not implementing GeanyProxyFuncs::probe + at all is equivalent to always returning @ref GEANY_PROXY_MATCH. - GeanyProxyFuncs::load must be implemented to actually load the plugin. It is called by Geany when the user enables the sub-plugin. What "loading" means is entirely up to the proxy plugin and probably depends on the interpreter of the dynamic language that shall be supported. After @@ -807,17 +806,17 @@ Consider the 5 basic cases: 1) A candidate comes with a suitable file extension but is not a workable plugin file at all. For example, your proxy supports plugins written in a shell script (.sh) but the shebang of that script points to an incompatible shell (or even lacks a shebang). You should check for this in -GeanyProxyFuncs::probe() and return @ref PROXY_IGNORED which hides that script from the Plugin +GeanyProxyFuncs::probe() and return @ref GEANY_PROXY_IGNORE which hides that script from the Plugin Manager and allows other enabled proxy plugins to pick it up. GeanyProxyFuncs::probe() returning -@ref PROXY_IGNORED is an indication that the candidate is meant for another proxy, or the user +@ref GEANY_PROXY_IGNORE is an indication that the candidate is meant for another proxy, or the user placed the file by accident in one of Geany's plugin directories. In other words the candidate simply doesn't correspond to your proxy. Thus any noise by debug messages for this case is undesirable. 2) A proxy plugin provides its own, versioned API to sub-plugin. The API version of the sub-plugin is not compatible with the API exposed by the proxy. GeanyProxyFuncs::probe() should never perform a version check because its sole purpose is to indicate a proxy's correspondence to a given -candidate. It should return @ref PROXY_MATCHED instead. Later, Geany will invoke the +candidate. It should return @ref GEANY_PROXY_MATCH instead. Later, Geany will invoke the GeanyProxyFuncs::load(), and this function is the right place for a version check. If it fails then you simply do not call GEANY_PLUGIN_REGISTER(), but rather print a debug message. The result is that the sub-plugin is not shown in the Plugin Manager at all. This is consistent with the @@ -967,7 +966,7 @@ static gint demoproxy_probe(GeanyPlugin *proxy, const gchar *filename, gpointer match = utils_str_equal(linebuf, "#!!PROXY_MAGIC!!\n"); fclose(f); } - return match ? PROXY_MATCHED : PROXY_IGNORED; + return match ? GEANY_PROXY_MATCH : GEANY_PROXY_IGNORE; } @endcode Modified: plugins/demoproxy.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -116,7 +116,7 @@ static gint demoproxy_probe(GeanyPlugin *proxy, const gchar *filename, gpointer match = utils_str_equal(linebuf, "#!!PROXY_MAGIC!!\n"); fclose(f); } - return match ? PROXY_MATCHED : PROXY_IGNORED; + return match ? GEANY_PROXY_MATCH : GEANY_PROXY_IGNORE; } Modified: src/plugindata.h 39 lines changed, 26 insertions(+), 13 deletions(-) =================================================================== @@ -59,7 +59,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 228 +#define GEANY_API_VERSION 229 /* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins * with GTK3-linked Geany leads to crash */ @@ -341,31 +341,44 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer data, GDestroyNotify fr /** Return values for GeanyProxyHooks::probe() * - * Only @c PROXY_IGNORED, @c PROXY_MATCHED or @c PROXY_MATCHED|PROXY_NOLOAD - * are valid return values. - * * @see geany_plugin_register_proxy() for a full description of the proxy plugin mechanisms. - * - * @since 1.26 (API 226) */ typedef enum { + /** @deprecated Use GEANY_PROXY_IGNORE instead. + * @since 1.26 (API 226) + */ + PROXY_IGNORED, + /** @deprecated Use GEANY_PROXY_MATCH instead. + * @since 1.26 (API 226) + */ + PROXY_MATCHED, + /** @deprecated Use GEANY_PROXY_RELATED instead. + * @since 1.26 (API 226) + */ + PROXY_NOLOAD = 0x100, /** The proxy is not responsible at all, and Geany or other plugins are free * to probe it. + * + * @since 1.29 (API 229) **/ - PROXY_IGNORED, - /** The proxy is responsible for this file, and creates a plugin for it */ - PROXY_MATCHED, - - /** The proxy is does not directly load it, but it's still tied to the proxy + GEANY_PROXY_IGNORE = PROXY_IGNORED, + /** The proxy is responsible for this file, and creates a plugin for it. + * + * @since 1.29 (API 229) + */ + GEANY_PROXY_MATCH = PROXY_MATCHED, + /** The proxy is does not directly load it, but it's still tied to the proxy. * * This is for plugins that come in multiple files where only one of these * files is relevant for the plugin creation (for the PM dialog). The other * files should be ignored by Geany and other proxies. Example: libpeas has * a .plugin and a .so per plugin. Geany should not process the .so file * if there is a corresponding .plugin. + * + * @since 1.29 (API 229) */ - PROXY_NOLOAD = 0x100, + GEANY_PROXY_RELATED = PROXY_MATCHED | PROXY_NOLOAD } GeanyProxyProbeResults; @@ -379,7 +392,7 @@ GeanyProxyProbeResults; struct GeanyProxyFuncs { /** Called to determine whether the proxy is truly responsible for the requested plugin. - * A NULL pointer assumes the probe() function would always return @ref PROXY_MATCHED */ + * A NULL pointer assumes the probe() function would always return @ref GEANY_PROXY_MATCH */ gint (*probe) (GeanyPlugin *proxy, const gchar *filename, gpointer pdata); /** Called after probe(), to perform the actual job of loading the plugin */ gpointer (*load) (GeanyPlugin *proxy, GeanyPlugin *subplugin, const gchar *filename, gpointer pdata); Modified: src/plugins.c 13 lines changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -1038,19 +1038,22 @@ static PluginProxy* is_plugin(const gchar *file) if (utils_str_casecmp(ext, proxy->extension) == 0) { Plugin *p = proxy->plugin; - gint ret = PROXY_MATCHED; + gint ret = GEANY_PROXY_MATCH; if (p->proxy_cbs.probe) ret = p->proxy_cbs.probe(&p->public, file, p->cb_data); switch (ret) { - case PROXY_MATCHED: + case GEANY_PROXY_MATCH: return proxy; - case PROXY_MATCHED|PROXY_NOLOAD: + case GEANY_PROXY_RELATED: return NULL; + case GEANY_PROXY_IGNORE: + continue; default: - if (ret != PROXY_IGNORED) - g_warning("Ignoring bogus return from proxy probe!\n"); + g_warning("Ignoring bogus return value '%d' from " + "proxy plugin '%s' probe() function!", ret, + proxy->plugin->info.name); continue; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cb7da7: Add CTAGS_ATTR_ prefix to UNUSED() and PRINTF() macros
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 22 Aug 2016 12:54:19 UTC Commit: cb7da79824ccd023c495de37f047ae1441b45fd5 https://github.com/geany/geany/commit/cb7da79824ccd023c495de37f047ae1441b45… Log Message: ----------- Add CTAGS_ATTR_ prefix to UNUSED() and PRINTF() macros Also fix the macro use in objc.c to appear behind variables. Modified Paths: -------------- ctags/main/general.h ctags/main/lregex.c ctags/main/mio.h ctags/main/options.c ctags/main/options.h ctags/main/parse.c ctags/main/parse.h ctags/main/routines.h ctags/main/xtag.c ctags/parsers/c.c ctags/parsers/lua.c ctags/parsers/objc.c Modified: ctags/main/general.h 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -30,11 +30,11 @@ * to prevent warnings about unused variables. */ #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) && !(defined (__APPLE_CC__) || defined (__GNUG__)) -# define UNUSED __attribute__((unused)) -# define PRINTF(s,f) __attribute__((format (printf, s, f))) +# define CTAGS_ATTR_UNUSED __attribute__((unused)) +# define CTAGS_ATTR_PRINTF(s,f) __attribute__((format (printf, s, f))) #else -# define UNUSED -# define PRINTF(s,f) +# define CTAGS_ATTR_UNUSED +# define CTAGS_ATTR_PRINTF(s,f) #endif Modified: ctags/main/lregex.c 30 lines changed, 15 insertions(+), 15 deletions(-) =================================================================== @@ -531,11 +531,11 @@ extern void findRegexTags (void) #endif /* HAVE_REGEX */ extern void addTagRegex ( - const langType language UNUSED, - const char* const regex UNUSED, - const char* const name UNUSED, - const char* const kinds UNUSED, - const char* const flags UNUSED) + const langType language CTAGS_ATTR_UNUSED, + const char* const regex CTAGS_ATTR_UNUSED, + const char* const name CTAGS_ATTR_UNUSED, + const char* const kinds CTAGS_ATTR_UNUSED, + const char* const flags CTAGS_ATTR_UNUSED) { #ifdef HAVE_REGEX Assert (regex != NULL); @@ -557,10 +557,10 @@ extern void addTagRegex ( } extern void addCallbackRegex ( - const langType language UNUSED, - const char* const regex UNUSED, - const char* const flags UNUSED, - const regexCallback callback UNUSED) + const langType language CTAGS_ATTR_UNUSED, + const char* const regex CTAGS_ATTR_UNUSED, + const char* const flags CTAGS_ATTR_UNUSED, + const regexCallback callback CTAGS_ATTR_UNUSED) { #ifdef HAVE_REGEX Assert (regex != NULL); @@ -574,7 +574,7 @@ extern void addCallbackRegex ( } extern void addLanguageRegex ( - const langType language UNUSED, const char* const regex UNUSED) + const langType language CTAGS_ATTR_UNUSED, const char* const regex CTAGS_ATTR_UNUSED) { #ifdef HAVE_REGEX if (! regexBroken) @@ -595,7 +595,7 @@ extern void addLanguageRegex ( */ extern boolean processRegexOption (const char *const option, - const char *const parameter UNUSED) + const char *const parameter CTAGS_ATTR_UNUSED) { boolean handled = FALSE; const char* const dash = strchr (option, '-'); @@ -617,7 +617,7 @@ extern boolean processRegexOption (const char *const option, return handled; } -extern void disableRegexKinds (const langType language UNUSED) +extern void disableRegexKinds (const langType language CTAGS_ATTR_UNUSED) { #ifdef HAVE_REGEX if (language <= SetUpper && Sets [language].count > 0) @@ -632,8 +632,8 @@ extern void disableRegexKinds (const langType language UNUSED) } extern boolean enableRegexKind ( - const langType language UNUSED, - const int kind UNUSED, const boolean mode UNUSED) + const langType language CTAGS_ATTR_UNUSED, + const int kind CTAGS_ATTR_UNUSED, const boolean mode CTAGS_ATTR_UNUSED) { boolean result = FALSE; #ifdef HAVE_REGEX @@ -653,7 +653,7 @@ extern boolean enableRegexKind ( return result; } -extern void printRegexKinds (const langType language UNUSED, boolean indent UNUSED) +extern void printRegexKinds (const langType language CTAGS_ATTR_UNUSED, boolean indent CTAGS_ATTR_UNUSED) { #ifdef HAVE_REGEX if (language <= SetUpper && Sets [language].count > 0) Modified: ctags/main/mio.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -162,8 +162,8 @@ int mio_ungetc (MIO *mio, int ch); int mio_putc (MIO *mio, int c); int mio_puts (MIO *mio, const char *s); -int mio_vprintf (MIO *mio, const char *format, va_list ap) PRINTF (2, 0); -int mio_printf (MIO *mio, const char *format, ...) PRINTF (2, 3); +int mio_vprintf (MIO *mio, const char *format, va_list ap) CTAGS_ATTR_PRINTF (2, 0); +int mio_printf (MIO *mio, const char *format, ...) CTAGS_ATTR_PRINTF (2, 3); void mio_clearerr (MIO *mio); int mio_eof (MIO *mio); Modified: ctags/main/options.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -208,7 +208,7 @@ void addIgnoreListFromFile (const char *const fileName) stringListCombine (Option.ignore, tokens); } -extern void processExcludeOption (const char *const UNUSED option, +extern void processExcludeOption (const char *const option CTAGS_ATTR_UNUSED, const char *const parameter) { if (parameter [0] == '\0') Modified: ctags/main/options.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -93,7 +93,7 @@ extern CONST_OPTION optionValues Option; /* * FUNCTION PROTOTYPES */ -extern void verbose (const char *const format, ...) PRINTF (1, 2); +extern void verbose (const char *const format, ...) CTAGS_ATTR_PRINTF (1, 2); extern void freeList (stringList** const pString); extern void setDefaultTagFileName (void); Modified: ctags/main/parse.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -383,7 +383,7 @@ extern void freeParserResources (void) */ extern void processLanguageDefineOption (const char *const option, - const char *const UNUSED parameter) + const char *const parameter CTAGS_ATTR_UNUSED) { #ifdef HAVE_REGEX if (parameter [0] == '\0') Modified: ctags/main/parse.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -144,7 +144,7 @@ extern void addLanguageRegex (const langType language, const char* const regex); extern void installTagRegexTable (const langType language); extern void addTagRegex (const langType language, const char* const regex, const char* const name, const char* const kinds, const char* const flags); extern void addCallbackRegex (const langType language, const char* const regex, const char* flags, const regexCallback callback); -extern void disableRegexKinds (const langType UNUSED language); +extern void disableRegexKinds (const langType language CTAGS_ATTR_UNUSED); extern boolean enableRegexKind (const langType language, const int kind, const boolean mode); extern void printRegexKindOptions (const langType language); extern void freeRegexResources (void); Modified: ctags/main/routines.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -63,7 +63,7 @@ enum eErrorTypes { FATAL = 1, WARNING = 2, PERROR = 4 }; */ extern void setExecutableName (const char *const path); extern const char *getExecutableName (void); -extern void error (const errorSelection selection, const char *const format, ...) PRINTF (2, 3); +extern void error (const errorSelection selection, const char *const format, ...) CTAGS_ATTR_PRINTF (2, 3); /* Memory allocation functions */ #ifdef NEED_PROTO_MALLOC Modified: ctags/main/xtag.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -20,7 +20,7 @@ #include <string.h> -static boolean isPseudoTagsEnabled (xtagDesc *pdesc UNUSED) +static boolean isPseudoTagsEnabled (xtagDesc *pdesc CTAGS_ATTR_UNUSED) { return ! isDestinationStdout (); } Modified: ctags/parsers/c.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -740,7 +740,7 @@ static const char *keywordString (const keywordId keyword) return name; } -static void UNUSED pt (tokenInfo *const token) +static void CTAGS_ATTR_UNUSED pt (tokenInfo *const token) { if (isType (token, TOKEN_NAME)) printf ("type: %-12s: %-13s line: %lu\n", @@ -755,7 +755,7 @@ static void UNUSED pt (tokenInfo *const token) tokenString (token->type), token->lineNumber); } -static void UNUSED ps (statementInfo *const st) +static void CTAGS_ATTR_UNUSED ps (statementInfo *const st) { unsigned int i; printf("scope: %s decl: %s gotName: %s gotParenName: %s\n", Modified: ctags/parsers/lua.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,7 @@ static kindOption LuaKinds [] = { */ /* for debugging purposes */ -static void UNUSED print_string (char *p, char *q) +static void CTAGS_ATTR_UNUSED print_string (char *p, char *q) { for ( ; p != q; p++) fprintf (errout, "%c", *p); Modified: ctags/parsers/objc.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -465,13 +465,13 @@ static objcToken waitedToken, fallBackToken; /* Ignore everything till waitedToken and jump to comeAfter. * If the "end" keyword is encountered break, doesn't remember * why though. */ -static void tillToken (vString * const UNUSED (ident), objcToken what) +static void tillToken (vString * const ident CTAGS_ATTR_UNUSED, objcToken what) { if (what == waitedToken) toDoNext = comeAfter; } -static void tillTokenOrFallBack (vString * const UNUSED (ident), objcToken what) +static void tillTokenOrFallBack (vString * const ident CTAGS_ATTR_UNUSED, objcToken what) { if (what == waitedToken) toDoNext = comeAfter; @@ -482,7 +482,7 @@ static void tillTokenOrFallBack (vString * const UNUSED (ident), objcToken what) } static int ignoreBalanced_count = 0; -static void ignoreBalanced (vString * const UNUSED (ident), objcToken what) +static void ignoreBalanced (vString * const ident CTAGS_ATTR_UNUSED, objcToken what) { switch (what) @@ -684,7 +684,7 @@ static void parseProperty (vString * const ident, objcToken what) } } -static void parseMethods (vString * const UNUSED (ident), objcToken what) +static void parseMethods (vString * const ident CTAGS_ATTR_UNUSED, objcToken what) { switch (what) { @@ -943,7 +943,7 @@ static void parseTypedef (vString * const ident, objcToken what) } static boolean ignorePreprocStuff_escaped = FALSE; -static void ignorePreprocStuff (vString * const UNUSED (ident), objcToken what) +static void ignorePreprocStuff (vString * const ident CTAGS_ATTR_UNUSED, objcToken what) { switch (what) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b7f7ce: Drop vi modelines
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 19 Aug 2016 14:16:32 UTC Commit: b7f7ce267546d4e43511b613594daeb6e8051559 https://github.com/geany/geany/commit/b7f7ce267546d4e43511b613594daeb6e8051… Log Message: ----------- Drop vi modelines Modified Paths: -------------- ctags/main/args.c ctags/main/args.h ctags/main/ctags.h ctags/main/entry.c ctags/main/entry.h ctags/main/general.h ctags/main/keyword.c ctags/main/keyword.h ctags/main/lcpp.c ctags/main/lcpp.h ctags/main/lregex.c ctags/main/main.c ctags/main/main.h ctags/main/nestlevel.c ctags/main/nestlevel.h ctags/main/options.c ctags/main/options.h ctags/main/parse.c ctags/main/parse.h ctags/main/parsers.h ctags/main/read.c ctags/main/read.h ctags/main/routines.c ctags/main/routines.h ctags/main/sort.c ctags/main/sort.h ctags/main/strlist.c ctags/main/strlist.h ctags/main/vstring.c ctags/main/vstring.h ctags/parsers/asciidoc.c ctags/parsers/asm.c ctags/parsers/basic.c ctags/parsers/c.c ctags/parsers/cobol.c ctags/parsers/conf.c ctags/parsers/diff.c ctags/parsers/erlang.c ctags/parsers/fortran.c ctags/parsers/haskell.c ctags/parsers/html.c ctags/parsers/jscript.c ctags/parsers/lua.c ctags/parsers/make.c ctags/parsers/matlab.c ctags/parsers/nsis.c ctags/parsers/pascal.c ctags/parsers/perl.c ctags/parsers/php.c ctags/parsers/powershell.c ctags/parsers/python.c ctags/parsers/r.c ctags/parsers/rest.c ctags/parsers/ruby.c ctags/parsers/sh.c ctags/parsers/sql.c ctags/parsers/tcl.c ctags/parsers/verilog.c ctags/parsers/vhdl.c Modified: ctags/main/args.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -252,5 +252,3 @@ extern void argDelete (Arguments* const current) memset (current, 0, sizeof (Arguments)); eFree (current); } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/args.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -55,5 +55,3 @@ extern void argForth (Arguments* const current); extern void argDelete (Arguments* const current); #endif /* CTAGS_MAIN_ARGS_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/ctags.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -23,5 +23,3 @@ #define AUTHOR_EMAIL "darren(a)hiebert.com" #endif /* CTAGS_MAIN_CTAGS_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/entry.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -412,5 +412,3 @@ extern void initTagEntry (tagEntryInfo *const e, const char *const name, const k e->name = name; e->kind = kind; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/entry.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -96,5 +96,3 @@ extern void makeTagEntry (const tagEntryInfo *const tag); extern void initTagEntry (tagEntryInfo *const e, const char *const name, const kindOption *kind); #endif /* CTAGS_MAIN_ENTRY_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/general.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -151,5 +151,3 @@ extern char *getenv (const char *); #endif #endif /* CTAGS_MAIN_GENERAL_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/keyword.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -228,5 +228,3 @@ extern void printKeywordTable (void) } #endif - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/keyword.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -29,5 +29,3 @@ extern void printKeywordTable (void); #endif #endif /* CTAGS_MAIN_KEYWORD_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/lcpp.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -980,5 +980,3 @@ extern char *cppGetArglistFromFilePos(MIOPos startPosition, const char *tokenNam mio_setpos(File.mio, &originalPosition); return arglist; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/lcpp.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -49,5 +49,3 @@ extern int cppSkipOverCComment (void); extern char *cppGetArglistFromFilePos(MIOPos startPosition, const char *tokenName); #endif /* CTAGS_MAIN_GET_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/lregex.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -685,5 +685,3 @@ extern void checkRegex (void) { /* not needed now we have GRegex */ } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/main.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -171,5 +171,3 @@ void utils_warn(const char *msg) { g_warning("%s", msg); } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/main.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -24,5 +24,3 @@ extern boolean isDestinationStdout (void); extern int main (int argc, char **argv); #endif /* CTAGS_MAIN_MAIN_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/nestlevel.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -74,5 +74,3 @@ extern NestingLevel *nestingLevelsGetCurrent(NestingLevels *nls) return &nls->levels[nls->n - 1]; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/nestlevel.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -48,5 +48,3 @@ extern void nestingLevelsPop(NestingLevels *nls); extern NestingLevel *nestingLevelsGetCurrent(NestingLevels *nls); #endif /* CTAGS_MAIN_NESTLEVEL_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/options.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -251,5 +251,3 @@ extern boolean isExcludedFile (const char* const name) #define readOptionConfiguration #define initOptions #define freeOptionResources - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/options.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -107,5 +107,3 @@ extern void freeOptionResources (void); void addIgnoreListFromFile (const char *const fileName); #endif /* CTAGS_MAIN_OPTIONS_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/parse.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -711,5 +711,3 @@ extern void installKeywordTable (const langType language) lang->keywordInstalled = TRUE; } } - -/* vi:set tabstop=4 shiftwidth=4 nowrap: */ Modified: ctags/main/parse.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -157,5 +157,3 @@ extern void *TagEntryUserData; extern void setTagEntryFunction(tagEntryFunction entry_function, void *user_data); #endif /* CTAGS_MAIN_PARSE_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/parsers.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -68,5 +68,3 @@ PowerShellParser #endif /* CTAGS_MAIN_PARSERS_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/read.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -619,5 +619,3 @@ extern char *readLineFromBypass ( what itself should do; just report it to the caller. */ return result; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/read.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -118,5 +118,3 @@ extern boolean bufferOpen (unsigned char *buffer, size_t buffer_size, #define bufferClose fileClose #endif /* CTAGS_MAIN_READ_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/routines.c 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -775,6 +775,3 @@ extern int strnicmp (const char *s1, const char *s2, size_t n) return result; } #endif - - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/routines.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -107,5 +107,3 @@ extern char* strstr (const char *str, const char *substr); #endif #endif /* CTAGS_MAIN_ROUTINES_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/sort.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -215,5 +215,3 @@ extern void internalSortTags (const boolean toStdout) } #endif - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/sort.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -26,5 +26,3 @@ extern void internalSortTags (const boolean toStdout); #endif #endif /* CTAGS_MAIN_SORT_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/strlist.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -276,5 +276,3 @@ extern void stringListPrint (const stringList *const current) for (i = 0 ; i < current->count ; ++i) printf ("%s%s", (i > 0) ? ", " : "", vStringValue (current->list [i])); } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/strlist.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -48,5 +48,3 @@ extern boolean stringListFileMatched (const stringList* const list, const char* extern void stringListPrint (const stringList *const current); #endif /* CTAGS_MAIN_STRLIST_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/vstring.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -243,5 +243,3 @@ extern vString *vStringNewOwn (char *s) return r; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/vstring.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -82,5 +82,3 @@ extern void vStringTruncate (vString *const string, const size_t length); extern vString *vStringNewOwn (char *s); #endif /* CTAGS_MAIN_VSTRING_H */ - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/asciidoc.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -229,5 +229,3 @@ extern parserDefinition* AsciidocParser (void) def->parser = findAsciidocTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/asm.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -366,5 +366,3 @@ extern parserDefinition* AsmParser (void) def->keywordCount = ARRAY_SIZE (AsmKeywords); return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/basic.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -253,5 +253,3 @@ parserDefinition *FreeBasicParser (void) def->parser = findBasicTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/c.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -3351,4 +3351,3 @@ extern parserDefinition* ValaParser (void) def->initialize = initializeValaParser; return def; } -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/cobol.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -47,5 +47,3 @@ extern parserDefinition* CobolParser (void) def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/conf.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -128,5 +128,3 @@ extern parserDefinition* ConfParser (void) def->parser = findConfTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/diff.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -133,5 +133,3 @@ extern parserDefinition* DiffParser (void) def->parser = findDiffTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/erlang.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -188,5 +188,3 @@ extern parserDefinition *ErlangParser (void) def->parser = findErlangTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/fortran.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -2361,4 +2361,3 @@ extern parserDefinition* F77Parser (void) def->keywordCount = ARRAY_SIZE (FortranKeywordTable); return def; } -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/haskell.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -354,5 +354,3 @@ extern parserDefinition* LiterateHaskellParser (void) def->parser = findLiterateHaskellTags; return def; } - -/* vi:set expandtab tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/html.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -58,5 +58,3 @@ extern parserDefinition* HtmlParser (void) def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/jscript.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -1904,4 +1904,3 @@ extern parserDefinition* JavaScriptParser (void) return def; } -/* vi:set tabstop=4 shiftwidth=4 noexpandtab: */ Modified: ctags/parsers/lua.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -127,5 +127,3 @@ extern parserDefinition* LuaParser (void) def->parser = findLuaTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/make.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -234,5 +234,3 @@ extern parserDefinition* MakefileParser (void) def->parser = findMakeTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/matlab.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -147,5 +147,3 @@ extern parserDefinition* MatlabParser (void) def->parser = findMatlabTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/nsis.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -144,5 +144,3 @@ extern parserDefinition* NsisParser (void) def->parser = findNsisTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/pascal.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -354,5 +354,3 @@ extern parserDefinition* PascalParser (void) def->parser = findPascalTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/perl.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -375,5 +375,3 @@ extern parserDefinition* PerlParser (void) def->parser = findPerlTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4 noexpandtab: */ Modified: ctags/parsers/php.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1484,5 +1484,3 @@ extern parserDefinition* ZephirParser (void) def->keywordCount = ARRAY_SIZE (PhpKeywordTable); return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/powershell.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -611,5 +611,3 @@ extern parserDefinition* PowerShellParser (void) def->parser = findPowerShellTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/python.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -831,5 +831,3 @@ extern parserDefinition *PythonParser (void) def->parser = findPythonTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/r.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -175,5 +175,3 @@ extern parserDefinition *RParser (void) def->parser = createRTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/rest.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -205,5 +205,3 @@ extern parserDefinition* RestParser (void) def->parser = findRestTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/ruby.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -550,5 +550,3 @@ extern parserDefinition* RubyParser (void) def->parser = findRubyTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/sh.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -109,5 +109,3 @@ extern parserDefinition* ShParser (void) def->parser = findShTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/sql.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -2351,5 +2351,3 @@ extern parserDefinition* SqlParser (void) def->keywordCount = ARRAY_SIZE (SqlKeywordTable); return def; } - -/* vi:set tabstop=4 shiftwidth=4 noexpandtab: */ Modified: ctags/parsers/tcl.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -144,5 +144,3 @@ extern parserDefinition* TclParser (void) def->parser = findTclTags; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/verilog.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -331,5 +331,3 @@ extern parserDefinition* VerilogParser (void) def->initialize = initialize; return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/parsers/vhdl.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -288,5 +288,3 @@ extern parserDefinition* VhdlParser (void) def->keywordCount = ARRAY_SIZE (VhdlKeywordTable); return def; } - -/* vi:set tabstop=4 shiftwidth=4: */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a974f3: Define KEYWORD_NONE in keyword.h so it doesn't have to be defined by parsers
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 16 Aug 2016 12:18:50 UTC Commit: a974f35752558173a470df92fb505cabb395af2a https://github.com/geany/geany/commit/a974f35752558173a470df92fb505cabb395a… Log Message: ----------- Define KEYWORD_NONE in keyword.h so it doesn't have to be defined by parsers Modified Paths: -------------- ctags/main/keyword.h ctags/parsers/c.c ctags/parsers/fortran.c ctags/parsers/go.c ctags/parsers/jscript.c ctags/parsers/php.c ctags/parsers/sql.c Modified: ctags/main/keyword.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,8 @@ #include "parse.h" +#define KEYWORD_NONE -1 + /* * FUNCTION PROTOTYPES */ Modified: ctags/parsers/c.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -59,7 +59,6 @@ typedef enum eException */ typedef enum eKeywordId { - KEYWORD_NONE = -1, KEYWORD_ATTRIBUTE, KEYWORD_ABSTRACT, KEYWORD_ALIAS, KEYWORD_BOOLEAN, KEYWORD_BYTE, KEYWORD_BAD_STATE, KEYWORD_BAD_TRANS, KEYWORD_BIND, KEYWORD_BIND_VAR, KEYWORD_BIT, KEYWORD_BODY, Modified: ctags/parsers/fortran.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,6 @@ typedef enum eFortranLineType { /* Used to specify type of keyword. */ typedef enum eKeywordId { - KEYWORD_NONE = -1, KEYWORD_allocatable, KEYWORD_assignment, KEYWORD_associate, Modified: ctags/parsers/go.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -28,7 +28,6 @@ */ typedef enum eKeywordId { - KEYWORD_NONE = -1, KEYWORD_package, KEYWORD_import, KEYWORD_const, Modified: ctags/parsers/jscript.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -52,7 +52,6 @@ static stringList *FunctionNames; /* Used to specify type of keyword. */ typedef enum eKeywordId { - KEYWORD_NONE = -1, KEYWORD_function, KEYWORD_capital_function, KEYWORD_capital_object, Modified: ctags/parsers/php.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -25,7 +25,6 @@ typedef enum { - KEYWORD_NONE = -1, KEYWORD_abstract, KEYWORD_and, KEYWORD_as, Modified: ctags/parsers/sql.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -54,7 +54,6 @@ typedef enum eException { ExceptionNone, ExceptionEOF } exception_t; * Used to specify type of keyword. */ typedef enum eKeywordId { - KEYWORD_NONE = -1, KEYWORD_is, KEYWORD_begin, KEYWORD_body, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ca65fa: Sync whitespace and comments in main
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: ca65fa22367042ea8c88efab7e76d5f0ba209947 https://github.com/geany/geany/commit/ca65fa22367042ea8c88efab7e76d5f0ba209… Log Message: ----------- Sync whitespace and comments in main Modified Paths: -------------- ctags/main/args.c ctags/main/args.h ctags/main/ctags.h ctags/main/entry.c ctags/main/entry.h ctags/main/general.h ctags/main/lcpp.c ctags/main/lregex.c ctags/main/main.c ctags/main/nestlevel.c ctags/main/nestlevel.h ctags/main/options.c ctags/main/options.h ctags/main/parse.c ctags/main/parse.h ctags/main/parsers.h ctags/main/read.c ctags/main/read.h ctags/main/routines.c ctags/main/sort.c ctags/main/sort.h ctags/main/strlist.c ctags/main/strlist.h ctags/main/vstring.c ctags/main/vstring.h Modified: ctags/main/args.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -1,23 +1,23 @@ /* -* -* Copyright (c) 1999-2001, Darren Hiebert +* Copyright (c) 1999-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for reading command line arguments. */ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <stdio.h> #include <string.h> #include <ctype.h> #include "args.h" +#include "debug.h" #include "routines.h" /* Modified: ctags/main/args.h 15 lines changed, 8 insertions(+), 7 deletions(-) =================================================================== @@ -1,19 +1,20 @@ /* -* -* Copyright (c) 1999-2001, Darren Hiebert +* Copyright (c) 1999-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Defines external interface to command line argument reading. */ -#ifndef _ARGS_H -#define _ARGS_H +#ifndef CTAGS_MAIN_ARGS_H +#define CTAGS_MAIN_ARGS_H /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ + +#include <stdio.h> /* * DATA DECLARATIONS @@ -53,6 +54,6 @@ extern void argSetLineMode (Arguments* const current); extern void argForth (Arguments* const current); extern void argDelete (Arguments* const current); -#endif /* _ARGS_H */ +#endif /* CTAGS_MAIN_ARGS_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/ctags.h 12 lines changed, 7 insertions(+), 5 deletions(-) =================================================================== @@ -1,13 +1,15 @@ /* -* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 1996-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Program definitions */ -#ifndef _CTAGS_H -#define _CTAGS_H +#ifndef CTAGS_MAIN_CTAGS_H +#define CTAGS_MAIN_CTAGS_H + +#include "general.h" /* * MACROS @@ -20,6 +22,6 @@ #define AUTHOR_NAME "Darren Hiebert" #define AUTHOR_EMAIL "darren(a)hiebert.com" -#endif /* _CTAGS_H */ +#endif /* CTAGS_MAIN_CTAGS_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/entry.c 21 lines changed, 10 insertions(+), 11 deletions(-) =================================================================== @@ -1,29 +1,28 @@ /* -* -* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 1996-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for creating tag entries. */ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> -#include <ctype.h> /* to define isspace () */ +#include <ctype.h> /* to define isspace () */ #include <errno.h> #include <glib.h> #include <glib/gstdio.h> #if defined (HAVE_SYS_TYPES_H) -# include <sys/types.h> /* to declare off_t on some hosts */ +# include <sys/types.h> /* to declare off_t on some hosts */ #endif #if defined (HAVE_TYPES_H) -# include <types.h> /* to declare off_t on some hosts */ +# include <types.h> /* to declare off_t on some hosts */ #endif @@ -159,14 +158,14 @@ static void addPseudoTags (void) } } -static void updateSortedFlag (const char *const line, - MIO *const mio, MIOPos startOfLine) +static void updateSortedFlag ( + const char *const line, MIO *const mio, MIOPos startOfLine) { const char *const tab = strchr (line, '\t'); if (tab != NULL) { - const long boolOffset = tab - line + 1; /* where it should be */ + const long boolOffset = tab - line + 1; /* where it should be */ if (line [boolOffset] == '0' || line [boolOffset] == '1') { @@ -231,7 +230,7 @@ static long unsigned int updatePseudoTags (MIO *const mio) } line = readLineRaw (TagFile.vLine, mio); } - while (line != NULL) /* skip to end of file */ + while (line != NULL) /* skip to end of file */ { ++linesRead; line = readLineRaw (TagFile.vLine, mio); Modified: ctags/main/entry.h 13 lines changed, 6 insertions(+), 7 deletions(-) =================================================================== @@ -1,19 +1,18 @@ /* -* -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * External interface to entry.c */ -#ifndef _ENTRY_H -#define _ENTRY_H +#ifndef CTAGS_MAIN_ENTRY_H +#define CTAGS_MAIN_ENTRY_H /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include "mio.h" #include "vstring.h" @@ -96,6 +95,6 @@ extern void endEtagsFile (const char *const name); extern void makeTagEntry (const tagEntryInfo *const tag); extern void initTagEntry (tagEntryInfo *const e, const char *const name, const kindOption *kind); -#endif /* _ENTRY_H */ +#endif /* CTAGS_MAIN_ENTRY_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/general.h 13 lines changed, 6 insertions(+), 7 deletions(-) =================================================================== @@ -1,19 +1,18 @@ /* -* -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Provides the general (non-ctags-specific) environment assumed by all. */ -#ifndef _GENERAL_H -#define _GENERAL_H +#ifndef CTAGS_MAIN_GENERAL_H +#define CTAGS_MAIN_GENERAL_H /* * INCLUDE FILES */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include <config.h> #endif #ifdef macintosh @@ -151,6 +150,6 @@ extern void *unlink (const char *); extern char *getenv (const char *); #endif -#endif /* _GENERAL_H */ +#endif /* CTAGS_MAIN_GENERAL_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/lcpp.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -166,7 +166,7 @@ extern void cppEndStatement (void) * directives and may emit a tag for #define directives. */ -/* This puts a character back into the input queue for the source File. +/* This puts a character back into the input queue for the input File. * Up to two characters may be ungotten. */ extern void cppUngetc (const int c) Modified: ctags/main/lregex.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -2,11 +2,11 @@ * Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions for applying regular expression matching. * -* The code for utlizing the Gnu regex package with regards to processing the +* The code for utilizing the Gnu regex package with regards to processing the * regex option and checking for regex matches was adapted from routines in * Gnu etags. */ @@ -91,6 +91,7 @@ static int SetUpper = -1; /* upper language index in list */ * FUNCTION DEFINITIONS */ + static void clearPatternSet (const langType language) { if (language <= SetUpper) Modified: ctags/main/main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -71,7 +71,7 @@ /* * MACROS */ -#define plural(value) (((unsigned long)(value) == 1L) ? "" : "s") +#define plural(value) (((unsigned long)(value) == 1L) ? "" : "s") /* * DATA DEFINITIONS Modified: ctags/main/nestlevel.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Defines external interface to scope nesting levels for tags. */ Modified: ctags/main/nestlevel.h 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -3,12 +3,12 @@ * Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Defines external interface to scope nesting levels for tags. */ -#ifndef _NESTLEVEL_H -#define _NESTLEVEL_H +#ifndef CTAGS_MAIN_NESTLEVEL_H +#define CTAGS_MAIN_NESTLEVEL_H /* * INCLUDE FILES @@ -47,6 +47,6 @@ extern void nestingLevelsPush(NestingLevels *nls, extern void nestingLevelsPop(NestingLevels *nls); extern NestingLevel *nestingLevelsGetCurrent(NestingLevels *nls); -#endif /* _NESTLEVEL_H */ +#endif /* CTAGS_MAIN_NESTLEVEL_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/options.c 15 lines changed, 7 insertions(+), 8 deletions(-) =================================================================== @@ -1,22 +1,21 @@ /* -* -* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 1996-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions to process command line options. */ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <ctype.h> /* to declare isspace () */ +#include <ctype.h> /* to declare isspace () */ #include "ctags.h" #include "routines.h" @@ -28,7 +27,7 @@ #define CTAGS_ENVIRONMENT "CTAGS" -#define CTAGS_FILE "tags" +#define CTAGS_FILE "tags" /* The following separators are permitted for list options. @@ -39,14 +38,14 @@ #define IGNORE_SEPARATORS ", \t\n" #ifndef DEFAULT_FILE_FORMAT -# define DEFAULT_FILE_FORMAT 2 +# define DEFAULT_FILE_FORMAT 2 #endif #if defined (WIN32) || defined (HAVE_OPENDIR) # define RECURSE_SUPPORTED #endif -#define isCompoundOption(c) (boolean) (strchr ("fohiILpDb", (c)) != NULL) +#define isCompoundOption(c) (boolean) (strchr ("fohiILpDb", (c)) != NULL) Modified: ctags/main/options.h 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -18,7 +18,7 @@ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <stdarg.h> @@ -88,7 +88,7 @@ typedef struct sOptionValues { /* * GLOBAL VARIABLES */ -extern CONST_OPTION optionValues Option; +extern CONST_OPTION optionValues Option; /* * FUNCTION PROTOTYPES @@ -106,6 +106,6 @@ extern void freeOptionResources (void); void addIgnoreListFromFile (const char *const fileName); -#endif /* _OPTIONS_H */ +#endif /* CTAGS_MAIN_OPTIONS_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/parse.c 11 lines changed, 5 insertions(+), 6 deletions(-) =================================================================== @@ -1,18 +1,17 @@ /* -* -* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 1996-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * -* This module contains functions for managing source languages and +* This module contains functions for managing input languages and * dispatching files to the appropriate language parser. */ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <string.h> @@ -163,7 +162,7 @@ static vString* determineInterpreter (const char* const cmd) { vStringClear (interpreter); for ( ; isspace (*p) ; ++p) - ; /* no-op */ + ; /* no-op */ for ( ; *p != '\0' && ! isspace (*p) ; ++p) vStringPut (interpreter, (int) *p); vStringTerminate (interpreter); Modified: ctags/main/parse.h 33 lines changed, 16 insertions(+), 17 deletions(-) =================================================================== @@ -1,21 +1,20 @@ /* -* -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Private definitions for parsing support. */ -#ifndef _PARSE_H -#define _PARSE_H +#ifndef CTAGS_MAIN_PARSE_H +#define CTAGS_MAIN_PARSE_H /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ -#include "parsers.h" /* contains list of parsers */ +#include "parsers.h" /* contains list of parsers */ #include "strlist.h" #include "entry.h" @@ -59,15 +58,15 @@ typedef struct { typedef struct { /* defined by parser */ - char* name; /* name of language */ - kindOption* kinds; /* tag kinds handled by parser */ - unsigned int kindCount; /* size of `kinds' list */ - kindOption* fileKind; /* kind for overriding the default fileKind */ - const char* const* extensions; /* list of default extensions */ - const char* const* patterns; /* list of default file name patterns */ - parserInitialize initialize; /* initialization routine, if needed */ - simpleParser parser; /* simple parser (common case) */ - rescanParser parser2; /* rescanning parser (unusual case) */ + char* name; /* name of language */ + kindOption* kinds; /* tag kinds handled by parser */ + unsigned int kindCount; /* size of `kinds' list */ + kindOption* fileKind; /* kind for overriding the default fileKind */ + const char *const *extensions; /* list of default extensions */ + const char *const *patterns; /* list of default file name patterns */ + parserInitialize initialize; /* initialization routine, if needed */ + simpleParser parser; /* simple parser (common case) */ + rescanParser parser2; /* rescanning parser (unusual case) */ unsigned int method; /* See PARSE__... definitions above */ /* used internally */ @@ -157,6 +156,6 @@ extern tagEntryFunction TagEntryFunction; extern void *TagEntryUserData; extern void setTagEntryFunction(tagEntryFunction entry_function, void *user_data); -#endif /* _PARSE_H */ +#endif /* CTAGS_MAIN_PARSE_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/parsers.h 13 lines changed, 6 insertions(+), 7 deletions(-) =================================================================== @@ -1,17 +1,16 @@ /* -* -* Copyright (c) 2000-2001, Darren Hiebert +* Copyright (c) 2000-2003, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * External interface to all language parsing modules. * -* To add a new language parser, you need only modify this single source +* To add a new language parser, you need only modify this single input * file to add the name of the parser definition function. */ -#ifndef _PARSERS_H -#define _PARSERS_H +#ifndef CTAGS_MAIN_PARSERS_H +#define CTAGS_MAIN_PARSERS_H /* Add the name of any new parser definition function here */ /* keep src/tagmanager/tm_parser.h in sync */ @@ -68,6 +67,6 @@ ZephirParser, \ PowerShellParser -#endif /* _PARSERS_H */ +#endif /* CTAGS_MAIN_PARSERS_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/read.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -258,7 +258,7 @@ extern boolean fileOpen (const char *const fileName, const langType language) */ if (File.mio != NULL) { - mio_free (File.mio); /* close any open source file */ + mio_free (File.mio); /* close any open input file */ File.mio = NULL; } @@ -365,8 +365,8 @@ static void fileNewline (void) File.newLine = FALSE; File.input.lineNumber++; File.source.lineNumber++; - DebugStatement ( if (Option.breakLine == File.lineNumber) lineBreak (); ) - DebugStatement ( debugPrintf (DEBUG_RAW, "%6ld: ", File.lineNumber); ) + DebugStatement ( if (Option.breakLine == File.input.lineNumber) lineBreak (); ) + DebugStatement ( debugPrintf (DEBUG_RAW, "%6ld: ", File.input.lineNumber); ) } /* This function reads a single character from the stream, performing newline @@ -412,7 +412,7 @@ static int iFileGetc (void) if (next != NEWLINE) mio_ungetc (File.mio, next); - c = NEWLINE; /* convert CR into newline */ + c = NEWLINE; /* convert CR into newline */ File.newLine = TRUE; mio_getpos (File.mio, &StartOfLine); } Modified: ctags/main/read.h 33 lines changed, 15 insertions(+), 18 deletions(-) =================================================================== @@ -1,19 +1,18 @@ /* -* -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * External interface to read.c */ -#ifndef _READ_H -#define _READ_H +#ifndef CTAGS_MAIN_READ_H +#define CTAGS_MAIN_READ_H /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #include <stdio.h> #include <ctype.h> @@ -40,17 +39,15 @@ */ enum eCharacters { - /* White space characters. - */ - SPACE = ' ', - NEWLINE = '\n', - CRETURN = '\r', - FORMFEED = '\f', - TAB = '\t', - VTAB = '\v', - - /* Some hard to read characters. - */ + /* white space characters */ + SPACE = ' ', + NEWLINE = '\n', + CRETURN = '\r', + FORMFEED = '\f', + TAB = '\t', + VTAB = '\v', + + /* some hard to read characters */ DOUBLE_QUOTE = '"', SINGLE_QUOTE = '\'', BACKSLASH = '\\', @@ -120,6 +117,6 @@ extern boolean bufferOpen (unsigned char *buffer, size_t buffer_size, const char *const fileName, const langType language ); #define bufferClose fileClose -#endif /* _READ_H */ +#endif /* CTAGS_MAIN_READ_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/routines.c 11 lines changed, 5 insertions(+), 6 deletions(-) =================================================================== @@ -332,7 +332,7 @@ extern boolean isRecursiveLink (const char* const dirName) char *const separator = strrchr (path, PATH_SEPARATOR); if (separator == NULL) break; - else if (separator == path) /* backed up to root directory */ + else if (separator == path) /* backed up to root directory */ *(separator + 1) = '\0'; else *separator = '\0'; @@ -379,7 +379,7 @@ extern const char *baseFilename (const char *const filePath) if (tail == NULL) tail = filePath; else - ++tail; /* step past last delimiter */ + ++tail; /* step past last delimiter */ return tail; } @@ -473,7 +473,6 @@ extern char* absoluteFilename (const char *file) { char *slashp, *cp; char *res = NULL; - if (isAbsolutePath (file)) res = eStrdup (file); else @@ -519,7 +518,7 @@ extern char* absoluteFilename (const char *file) else { #ifdef MSDOS_STYLE_PATH - /* Canonicalize drive letter case. */ + /* Canonicalize drive letter case. */ if (res [1] == ':' && islower (res [0])) res [0] = toupper (res [0]); #endif @@ -572,11 +571,11 @@ extern char* relativeFilename (const char *file, const char *dir) while (*fp++ == *dp++) continue; fp--; - dp--; /* back to the first differing char */ + dp--; /* back to the first differing char */ do { /* look at the equal chars until '/' */ if (fp == absdir) - return absdir; /* first char differs, give up */ + return absdir; /* first char differs, give up */ fp--; dp--; } while (*fp != '/'); Modified: ctags/main/sort.c 15 lines changed, 7 insertions(+), 8 deletions(-) =================================================================== @@ -1,20 +1,19 @@ /* -* -* Copyright (c) 1996-2001, Darren Hiebert +* Copyright (c) 1996-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions to sort the tag entries. */ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #if defined (HAVE_STDLIB_H) -# include <stdlib.h> /* to declare malloc () */ +# include <stdlib.h> /* to declare malloc () */ #endif #include <string.h> #include <stdio.h> @@ -124,8 +123,8 @@ static int compareTags (const void *const one, const void *const two) return strcmp (line1, line2); } -static void writeSortedTags (char **const table, const size_t numTags, - const boolean toStdout) +static void writeSortedTags ( + char **const table, const size_t numTags, const boolean toStdout) { MIO *mio; size_t i; @@ -186,7 +185,7 @@ extern void internalSortTags (const boolean toStdout) break; } else if (*line == '\0' || strcmp (line, "\n") == 0) - ; /* ignore blank lines */ + ; /* ignore blank lines */ else { const size_t stringSize = strlen (line) + 1; Modified: ctags/main/sort.h 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -1,18 +1,18 @@ /* -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * External interface to sort.c */ -#ifndef _SORT_H -#define _SORT_H +#ifndef CTAGS_MAIN_SORT_H +#define CTAGS_MAIN_SORT_H /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ /* * FUNCTION PROTOTYPES @@ -25,6 +25,6 @@ extern void externalSortTags (const boolean toStdout); extern void internalSortTags (const boolean toStdout); #endif -#endif /* _SORT_H */ +#endif /* CTAGS_MAIN_SORT_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/strlist.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ * Copyright (c) 1999-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions managing resizable string lists. */ Modified: ctags/main/strlist.h 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -2,12 +2,12 @@ * Copyright (c) 1999-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Defines external interface to resizable string lists. */ -#ifndef _STRLIST_H -#define _STRLIST_H +#ifndef CTAGS_MAIN_STRLIST_H +#define CTAGS_MAIN_STRLIST_H /* * INCLUDE FILES @@ -47,6 +47,6 @@ extern boolean stringListExtensionMatched (const stringList* const list, const c extern boolean stringListFileMatched (const stringList* const list, const char* const str); extern void stringListPrint (const stringList *const current); -#endif /* _STRLIST_H */ +#endif /* CTAGS_MAIN_STRLIST_H */ /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/vstring.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -1,22 +1,22 @@ /* -* * Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * This module contains functions supporting resizeable strings. */ /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ -#include <limits.h> /* to define INT_MAX */ +#include <limits.h> /* to define INT_MAX */ #include <string.h> #include <ctype.h> +#include "debug.h" #include "routines.h" #include "vstring.h" @@ -60,7 +60,7 @@ extern void vStringTruncate (vString *const string, const size_t length) string->length = length; vStringTerminate (string); DebugStatement ( memset (string->buffer + string->length, 0, - string->size - string->length); ) + string->size - string->length); ) } extern void vStringClear (vString *const string) @@ -134,7 +134,7 @@ extern vString *vStringNewInit (const char *const s) } extern void vStringNCatS ( - vString *const string, const char *const s, const size_t length) + vString *const string, const char *const s, const size_t length) { const char *p = s; size_t remain = length; @@ -204,7 +204,7 @@ extern void vStringCopyS (vString *const string, const char *const s) } extern void vStringNCopyS ( - vString *const string, const char *const s, const size_t length) + vString *const string, const char *const s, const size_t length) { vStringClear (string); vStringNCatS (string, s, length); Modified: ctags/main/vstring.h 50 lines changed, 25 insertions(+), 25 deletions(-) =================================================================== @@ -2,20 +2,20 @@ * Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the -* GNU General Public License. +* GNU General Public License version 2 or (at your option) any later version. * * Provides the external interface for resizeable strings. */ -#ifndef _VSTRING_H -#define _VSTRING_H +#ifndef CTAGS_MAIN_VSTRING_H +#define CTAGS_MAIN_VSTRING_H /* * INCLUDE FILES */ -#include "general.h" /* must always come first */ +#include "general.h" /* must always come first */ #if defined(HAVE_STDLIB_H) -# include <stdlib.h> /* to define size_t */ +# include <stdlib.h> /* to define size_t */ #endif /* @@ -26,33 +26,33 @@ #endif #ifdef VSTRING_PUTC_MACRO #define vStringPut(s,c) \ - (void)(((s)->length + 1 == (s)->size ? vStringAutoResize (s) : 0), \ - ((s)->buffer [(s)->length] = (c)), \ - ((c) == '\0' ? 0 : ((s)->buffer [++(s)->length] = '\0'))) + (void)(((s)->length + 1 == (s)->size ? vStringAutoResize (s) : 0), \ + ((s)->buffer [(s)->length] = (c)), \ + ((c) == '\0' ? 0 : ((s)->buffer [++(s)->length] = '\0'))) #endif -#define vStringValue(vs) ((vs)->buffer) -#define vStringItem(vs,i) ((vs)->buffer[i]) -#define vStringLast(vs) ((vs)->buffer[(vs)->length - 1]) -#define vStringLength(vs) ((vs)->length) -#define vStringSize(vs) ((vs)->size) -#define vStringCat(vs,s) vStringCatS((vs), vStringValue((s))) -#define vStringNCat(vs,s,l) vStringNCatS((vs), vStringValue((s)), (l)) -#define vStringCopy(vs,s) vStringCopyS((vs), vStringValue((s))) -#define vStringNCopy(vs,s,l) vStringNCopyS((vs), vStringValue((s)), (l)) -#define vStringChar(vs,i) ((vs)->buffer[i]) -#define vStringTerminate(vs) vStringPut(vs, '\0') -#define vStringLower(vs) toLowerString((vs)->buffer) -#define vStringUpper(vs) toUpperString((vs)->buffer) +#define vStringValue(vs) ((vs)->buffer) +#define vStringItem(vs,i) ((vs)->buffer[i]) +#define vStringLast(vs) ((vs)->buffer[(vs)->length - 1]) +#define vStringLength(vs) ((vs)->length) +#define vStringSize(vs) ((vs)->size) +#define vStringCat(vs,s) vStringCatS((vs), vStringValue((s))) +#define vStringNCat(vs,s,l) vStringNCatS((vs), vStringValue((s)), (l)) +#define vStringCopy(vs,s) vStringCopyS((vs), vStringValue((s))) +#define vStringNCopy(vs,s,l) vStringNCopyS((vs), vStringValue((s)), (l)) +#define vStringChar(vs,i) ((vs)->buffer[i]) +#define vStringTerminate(vs) vStringPut(vs, '\0') +#define vStringLower(vs) toLowerString((vs)->buffer) +#define vStringUpper(vs) toUpperString((vs)->buffer) /* * DATA DECLARATIONS */ typedef struct sVString { - size_t length; /* size of buffer used */ - size_t size; /* allocated size of buffer */ - char * buffer; /* location of buffer */ + size_t length; /* size of buffer used */ + size_t size; /* allocated size of buffer */ + char *buffer; /* location of buffer */ } vString; /* @@ -81,6 +81,6 @@ extern void vStringTruncate (vString *const string, const size_t length); extern vString *vStringNewOwn (char *s); -#endif /* _VSTRING_H */ +#endif /* CTAGS_MAIN_VSTRING_H */ /* vi:set tabstop=4 shiftwidth=4: */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2016