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

Object handling #1045

Merged
merged 16 commits into from
Oct 22, 2024
Merged

Object handling #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e1003ef
ptp2: code cosmetic and disabling of unused code
axxel Oct 20, 2024
5025949
ptp2: Canon cameras are (potentially) mtp capable
axxel Oct 20, 2024
00c3d31
ptp2: set fs mtime to oi.ModificationDate instead of local time on th…
axxel Oct 20, 2024
17534a4
ptp2: rename ptp_object_find* -> ptp_find_*object_in_cache
axxel Oct 20, 2024
415d987
ptp2: reorder ptp_list_folder_eos call, reducing code duplication
axxel Oct 20, 2024
aa3e5f9
ptp2: reduce code duplication near object path handling
axxel Oct 21, 2024
71944b2
ptp2: use array abstraction for static special_files array
axxel Oct 21, 2024
1ab9559
ptp2: make sure the returned mtp_get_playlist_string is null-terminated
axxel Oct 21, 2024
a792bbd
log: make gp_filesystem_list_files less verbose in debug log
axxel Oct 21, 2024
0e8be61
ptp2: fix usability issue with array_push_back
axxel Oct 21, 2024
c704eee
ptp2: use array abstraction and find_object_path in ptp_mtp_parse_met…
axxel Oct 21, 2024
39756fd
ptp2: remove call to ptp_object_want that had zero effect
axxel Oct 21, 2024
5af7a9b
ptp2: replace calls to ptp_object_want with ptp_find_object_in_cache
axxel Oct 21, 2024
16f1b7d
ptp2: fix readability and debug output in folder_to_handle ...
axxel Oct 21, 2024
ffff8f0
ptp2: cleanup of find_child() and [folder|file]_list_func() functions
axxel Oct 22, 2024
95a4115
ptp2: make ptp_getstorageids() return only valid ids
axxel Oct 22, 2024
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
9 changes: 7 additions & 2 deletions camlibs/ptp2/array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@
* #define for_each(PTR, ARRAY) for (typeof(ARRAY.val) PTR = ARRAY.val; PTR != ARRAY.val + ARRAY.len; ++PTR)
*/
#define for_each(TYPE, PTR, ARRAY) \
for (TYPE PTR = ARRAY.val; PTR < ARRAY.val + ARRAY.len; ++PTR)
for (TYPE PTR = (ARRAY).val; PTR < (ARRAY).val + (ARRAY).len; ++PTR)

#define array_init(ARRAY) do { \
(ARRAY)->val = 0; \
(ARRAY)->len = 0; \
} while (0)

#define free_array(ARRAY) do { \
free ((ARRAY)->val); \
Expand Down Expand Up @@ -87,7 +92,7 @@

#define array_push_back(ARRAY, VAL) do { \
array_extend_capacity(ARRAY, 1); \
move((ARRAY)->val[(ARRAY)->len++], VAL); \
(ARRAY)->val[(ARRAY)->len++] = VAL; \
} while(0)

#define array_append_copy(DST, SRC) do { \
Expand Down
Loading
Loading