-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
Formatted #12
Open
SuperTaiyaki
wants to merge
3
commits into
gphoto:master
Choose a base branch
from
SuperTaiyaki:formatted
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Formatted #12
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
@@ -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; | ||
} else if (ret < 1) { | ||
g_fprintf(stderr, "No cameras detected on specified port.\n"); | ||
return ret; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. | ||
*/ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.