[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Graveman-cvs] Changes to graveman/current/src/readcd.c
From: |
sylvain cresto |
Subject: |
[Graveman-cvs] Changes to graveman/current/src/readcd.c |
Date: |
Sun, 20 Feb 2005 12:45:30 -0500 |
Index: graveman/current/src/readcd.c
diff -u graveman/current/src/readcd.c:1.9 graveman/current/src/readcd.c:1.10
--- graveman/current/src/readcd.c:1.9 Sat Feb 19 17:49:08 2005
+++ graveman/current/src/readcd.c Sun Feb 20 17:45:02 2005
@@ -52,7 +52,7 @@
gdouble *Lreadtodo = (gdouble *) sc_grave_get_data(Lg, "readtodo"); /*
nombre de secteur a traiter */
gint *Ltodo = (gint *) sc_grave_get_data(Lg, "todo"); /* nombre de piste a
traiter */
gint *Ldone = (gint *) sc_grave_get_data(Lg, "done"); /* nombre de piste
deja traite */
- gchar **Lvitesse = (gchar **) sc_grave_get_data(Lg, "tmpdir"); /* en fait
la vitesse de lecture */
+ gchar *Lvitesse = (gchar *) sc_grave_get_data(Lg, "tmpdir"); /* en fait la
vitesse de lecture */
gchar Lbuffer[_BUF_SIZE];
gdouble Ltotaldone, Lpct, Ltava;
gchar *e, *f;
@@ -79,8 +79,7 @@
if ((e=strchr(f, 'x'))) *e=0;
- if (*Lvitesse) g_free(*Lvitesse);
- *Lvitesse = strdup(f);
+ g_strlcpy(Lvitesse, f, MAXPATHLEN-1);
}
} else if ((f=strstr(Lbuffer, READCD_CAPACITY))) {
@@ -97,8 +96,8 @@
*Lcont = 0;
return FALSE;
}
- if (*Lvitesse && **Lvitesse) {
- Ltxt=g_strdup_printf(_("Reading CD at %sx..."), *Lvitesse);
+ if (*Lvitesse) {
+ Ltxt=g_strdup_printf(_("Reading CD at %sx..."), Lvitesse);
} else {
Ltxt = g_strdup(_("Reading CD..."));
}
@@ -149,7 +148,7 @@
GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstcopyspeed");
- gchar **Liso = (gchar **)sc_grave_get_data(Ag, "iso"); /* image iso */
+ gchar *Liso = (gchar *)sc_grave_get_data(Ag, "iso"); /* image iso */
gdouble Lreadtodo = 0;
gint g_in, g_out, g_err, Lnbrarg;
gboolean Lstatus = FALSE;
@@ -162,7 +161,7 @@
Lbufvitesse = get_combo_value(Lvitesse);
Lbuflect = get_combo_value(Llecteur);
Lcommandline = g_strdup_printf("%s dev=%s f=\"%s\" %s%s -v",
- conf_get_string("readcd"), Lbuflect, *Liso, *Lbufvitesse != '0' ?
"speed=" : "", *Lbufvitesse != '0' ? Lbufvitesse : "");
+ conf_get_string("readcd"), Lbuflect, Liso, *Lbufvitesse != '0' ?
"speed=" : "", *Lbufvitesse != '0' ? Lbufvitesse : "");
g_free(Lbuflect);
g_free(Lbufvitesse);