[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Graveman-cvs] Changes to graveman/current/src/data.c
From: |
sylvain cresto |
Subject: |
[Graveman-cvs] Changes to graveman/current/src/data.c |
Date: |
Sun, 20 Feb 2005 12:45:23 -0500 |
Index: graveman/current/src/data.c
diff -u graveman/current/src/data.c:1.6 graveman/current/src/data.c:1.7
--- graveman/current/src/data.c:1.6 Sat Feb 19 17:49:08 2005
+++ graveman/current/src/data.c Sun Feb 20 17:45:02 2005
@@ -31,10 +31,10 @@
Tgrave *Lg = (Tgrave *)Adata;
gchar *Lonlyname = NULL, *Lnom = NULL, *Lnomutf8 = NULL;
gchar *Lonlynameparent = NULL;
- gchar **Ltmpdir = (gchar **) sc_grave_get_data(Lg, "tmpdir");
+ gchar *Ltmpdir = (gchar *) sc_grave_get_data(Lg, "tmpdir");
GError **Lerror = (GError **) sc_grave_get_data(Lg, "gerror");
- gchar Lnewname[10000];
- gchar Lparents[10000], Ltmp[10000];
+ gchar Lnewname[MAXPATHLEN];
+ gchar Lparents[MAXPATHLEN], Ltmp[MAXPATHLEN];
GtkTreeIter LparentIter;
GtkTreePath *Lparentpath;
gboolean Lreturn = FALSE;
@@ -63,7 +63,7 @@
gtk_tree_path_free(Lparentpath);
if (!Lreturn) {
- g_snprintf(Lnewname, sizeof(Lnewname)-1, "%s/%s%s", *Ltmpdir, Lparents,
Lonlyname);
+ g_snprintf(Lnewname, sizeof(Lnewname)-1, "%s/%s%s", Ltmpdir, Lparents,
Lonlyname);
if (Ltype == TYPE_DIR) {
/* si c'est un repertoire alors on le cree */
@@ -99,24 +99,23 @@
* temporraire et des liens qui vont servir a creer l'image a graver */
gboolean preparedata(Tgrave *Ag, GError **Aerror)
{
- gchar **Ltmpdir = (gchar **)sc_grave_get_data(Ag, "tmpdir");
- GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+ gchar *Ltmpdir = (gchar *)sc_grave_get_data(Ag, "tmpdir");
+ GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
GtkTreeModel *LTreeModel =
gtk_tree_view_get_model(GTK_TREE_VIEW(sc_grave_get_data(Ag, "_current_list")));
- gchar *Lnamedir;
gboolean Lstatus = TRUE;
g_assert(LTreeModel);
- Lnamedir = g_strdup_printf("%s/%s", conf_get_string_def("tmpdir", "/tmp"),
"gravemanXXXXXX");
+ g_snprintf(Ltmpdir, MAXPATHLEN-1, "%s/%s", conf_get_string_def("tmpdir",
"/tmp"), "gravemanXXXXXX");
gtk_label_set_text(Ltitle, _("Prepare files..."));
- if (!mkdtemp(Lnamedir)) {
+ if (!mkdtemp(Ltmpdir)) {
g_set_error(Aerror, G_FILE_ERROR, g_file_error_from_errno(errno), "%s %s:
%s",
- _("Cannot create directory"), Lnamedir, g_strerror(errno));
+ _("Cannot create directory"), Ltmpdir, g_strerror(errno));
+ *Ltmpdir = 0;
Lstatus = FALSE;
} else {
- *Ltmpdir = Lnamedir;
/* conversion de chaques fichiers */
gtk_tree_model_foreach(LTreeModel, foreachfiles, Ag);
@@ -125,11 +124,6 @@
if ((GError *)*Aerror) Lstatus = FALSE;
}
- if (Lstatus == FALSE)
- {
- g_free(Lnamedir);
- *Ltmpdir = NULL;
- }
return Lstatus;
}