Added missing initialization of CameraAbilities struct. This fixes corrupt
abilities reported to libphoto2. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3642 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -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));
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 <urc8@rz.uni-karlsruhe.de>
|
||||
*
|
||||
@@ -188,6 +192,7 @@ int camera_abilities (CameraAbilitiesList *list) {
|
||||
|
||||
int x=0;
|
||||
CameraAbilities a;
|
||||
memset (&a, 0, sizeof(a));
|
||||
|
||||
while (models[x]) {
|
||||
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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");
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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...)
|
||||
|
||||
Reference in New Issue
Block a user