diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c index 19cecb1e2..42634b574 100644 --- a/camlibs/barbie/barbie.c +++ b/camlibs/barbie/barbie.c @@ -47,6 +47,7 @@ camera_abilities (CameraAbilitiesList *list) CameraAbilities a; while (models[x]) { + memset (&a, 0, sizeof(a)); /* Fill in the appropriate flags/data */ memset(&a, 0, sizeof(a)); diff --git a/camlibs/casio/casio-qv.c b/camlibs/casio/casio-qv.c index 363d2d39a..fac73a8ae 100644 --- a/camlibs/casio/casio-qv.c +++ b/camlibs/casio/casio-qv.c @@ -65,9 +65,12 @@ camera_abilities (CameraAbilitiesList *list) CameraAbilities a; for (i = 0; models[i].model; i++) { + if (!models[i].public) continue; + memset(&a,0,sizeof(a)); + memset(&a, 0, sizeof(a)); strcpy (a.model, models[i].model); a.status = GP_DRIVER_STATUS_EXPERIMENTAL; diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c index c689d307e..3a94a27cc 100644 --- a/camlibs/dimera/dimera3500.c +++ b/camlibs/dimera/dimera3500.c @@ -21,6 +21,10 @@ * * History: * $Log$ + * Revision 1.34 2002/01/02 00:29:10 hun + * Added missing initialization of CameraAbilities struct. This fixes corrupt + * abilities reported to libphoto2. + * * Revision 1.33 2001/12/31 21:29:25 lutz * 2001-12-31 Lutz Müller * @@ -188,6 +192,7 @@ int camera_abilities (CameraAbilitiesList *list) { int x=0; CameraAbilities a; + memset (&a, 0, sizeof(a)); while (models[x]) { diff --git a/camlibs/kodak/dc120/dc120.c b/camlibs/kodak/dc120/dc120.c index 22fb95308..823c8f311 100644 --- a/camlibs/kodak/dc120/dc120.c +++ b/camlibs/kodak/dc120/dc120.c @@ -37,6 +37,7 @@ int camera_id (CameraText *id) { int camera_abilities (CameraAbilitiesList *list) { CameraAbilities a; + memset (&a, 0, sizeof(a)); memset(&a, 0, sizeof(a)); strcpy(a.model, "Kodak DC120"); diff --git a/camlibs/kodak/dc3200/dc3200.c b/camlibs/kodak/dc3200/dc3200.c index f7a28a5bf..9d9f65a06 100644 --- a/camlibs/kodak/dc3200/dc3200.c +++ b/camlibs/kodak/dc3200/dc3200.c @@ -37,6 +37,7 @@ int camera_id (CameraText *id) int camera_abilities (CameraAbilitiesList *list) { CameraAbilities a; + memset (&a, 0, sizeof(a)); memset(&a, 0, sizeof(a)); strcpy(a.model, "Kodak DC3200"); diff --git a/camlibs/panasonic/dc1000.c b/camlibs/panasonic/dc1000.c index c4ccdb568..f761bad32 100644 --- a/camlibs/panasonic/dc1000.c +++ b/camlibs/panasonic/dc1000.c @@ -344,6 +344,7 @@ int camera_abilities (CameraAbilitiesList *list) { CameraAbilities a; int result; + memset (&a, 0, sizeof(a)); memset(&a, 0, sizeof(a)); strcpy(a.model, "Panasonic DC1000"); diff --git a/camlibs/panasonic/l859/l859.c b/camlibs/panasonic/l859/l859.c index 924de53df..2f1764894 100644 --- a/camlibs/panasonic/l859/l859.c +++ b/camlibs/panasonic/l859/l859.c @@ -354,6 +354,7 @@ int camera_id (CameraText *id) { int camera_abilities (CameraAbilitiesList *list) { CameraAbilities a; + memset (&a, 0, sizeof(a)); GP_DEBUG ("Camera Abilities"); diff --git a/camlibs/samsung/samsung.c b/camlibs/samsung/samsung.c index b48b12e3a..e7970e100 100644 --- a/camlibs/samsung/samsung.c +++ b/camlibs/samsung/samsung.c @@ -142,6 +142,7 @@ camera_abilities (CameraAbilitiesList *list) CameraAbilities a; for (i = 0; models[i].model; i++) { + memset (&a, 0, sizeof(a)); memset(&a, 0, sizeof(a)); strcpy (a.model, models[i].model); diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index 12707d24d..273f5c187 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -39,6 +39,7 @@ int camera_abilities (CameraAbilitiesList *list) { //*count = 1; CameraAbilities a; + memset (&a, 0, sizeof(a)); /* Fill in each camera model's abilities */ /* Make separate entries for each conneciton type (usb, serial, etc...)