Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Formatted #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Formatted #12

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f96abc
Soft tabs
Dec 11, 2017
e844706
Changes integrated but apparently not working
Dec 11, 2017
f27ae2d
Replace invalid count with an error code
Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 56 additions & 26 deletions gphotofs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,32 +805,6 @@ gphotofs_connect()
break;
}

if (sModel) {
CameraAbilities a;
int m;

m = gp_abilities_list_lookup_model(p->abilities, sModel);
if (m < 0) {
g_fprintf(stderr, _("Model %s was not recognised."), sModel);
g_fprintf(stderr, "\n");
ret = m;
break;
}

ret = gp_abilities_list_get_abilities(p->abilities, m, &a);
if (ret != 0)
break;

ret = gp_camera_set_abilities(p->camera, a);
if (ret != 0)
break;

/* Marcus: why save it? puzzling. */
ret = gp_setting_set("gphoto2", "model", a.model);
if (ret != 0)
break;
}

if (sPort) {
GPPortInfo info;
GPPortInfoList *il = NULL;
Expand Down Expand Up @@ -871,10 +845,66 @@ gphotofs_connect()
gp_port_info_get_path (info, &xpath);
gp_setting_set("gphoto2", "port", xpath);

// According to the gphoto2 docs, both port and abilities must be set or the camera will be
// auto-detected.
if (!sModel) {
CameraList *cameraList;
ret = gp_list_new(&cameraList);
if (ret != 0)
break;

ret = gp_abilities_list_detect(p->abilities, il, cameraList, p->context);
if (ret != 0)
break;

ret = gp_list_count(cameraList);
if (ret > 1) {

g_fprintf(stderr, "Multiple cameras detected on specified port. Model is required.\n");
return GP_ERROR;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the list is never freed. Here or below.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it necessary? I'm considering this to be the same case as ret != 0, where the whole program exits immediately without proceeding to the actual mount.

} else if (ret < 1) {
g_fprintf(stderr, "No cameras detected on specified port.\n");
return ret;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as above. cameraList is not freed.

}

const char *model;
ret = gp_list_get_name(cameraList, 0, &model);
if (ret != 0)
break;
sModel = strdup(model);
gp_list_free(cameraList);
}
gp_port_info_list_free(il);
}
}

if (sModel) {
CameraAbilities a;
int m;

m = gp_abilities_list_lookup_model(p->abilities, sModel);
if (m < 0) {
g_fprintf(stderr, _("Model %s was not recognised."), sModel);
g_fprintf(stderr, "\n");
ret = m;
break;
}

ret = gp_abilities_list_get_abilities(p->abilities, m, &a);
if (ret != 0)
break;

ret = gp_camera_set_abilities(p->camera, a);
if (ret != 0)
break;

/* Marcus: why save it? puzzling. */
ret = gp_setting_set("gphoto2", "model", a.model);
if (ret != 0)
break;
}


/* Check the connection by checking the storage info of the device.
* Abort if the device has no valid storage listed.
*/
Expand Down