Skip to content

Change ringfs_init return type from int to void. #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.

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

Open
denravonska wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change ringfs_init return type from int to void. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions ringfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static void _loc_advance_slot(struct ringfs *fs, struct ringfs_loc *loc)

/* And here we go. */

int ringfs_init(struct ringfs *fs, struct ringfs_flash_partition *flash, uint32_t version, int object_size)
void ringfs_init(struct ringfs *fs, struct ringfs_flash_partition *flash, uint32_t version, int object_size)
{
/* Copy arguments to instance. */
fs->flash = flash;
Expand All @@ -151,8 +151,6 @@ int ringfs_init(struct ringfs *fs, struct ringfs_flash_partition *flash, uint32_
/* Precalculate commonly used values. */
fs->slots_per_sector = (fs->flash->sector_size - sizeof(struct sector_header)) /
(sizeof(struct slot_header) + fs->object_size);

return 0;
}

int ringfs_format(struct ringfs *fs)
Expand Down
3 changes: 1 addition & 2 deletions ringfs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,8 @@ struct ringfs {
* @param version Object version. Should be incremented whenever the object's
* semantics or size change in a backwards-incompatible way.
* @param object_size Size of one stored object, in bytes.
* @returns Zero on success, -1 on failure.
*/
int ringfs_init(struct ringfs *fs, struct ringfs_flash_partition *flash, uint32_t version, int object_size);
void ringfs_init(struct ringfs *fs, struct ringfs_flash_partition *flash, uint32_t version, int object_size);

/**
* Format the flash memory.
Expand Down
2 changes: 1 addition & 1 deletion tests/pyringfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class StructRingFS(Structure):
class libringfs(GenericLibrary):
dllname = './ringfs.so'
functions = [
['ringfs_init', [POINTER(StructRingFS), POINTER(StructRingFSFlashPartition), c_uint32, c_int], c_int],
['ringfs_init', [POINTER(StructRingFS), POINTER(StructRingFSFlashPartition), c_uint32, c_int], None],
['ringfs_format', [POINTER(StructRingFS)], c_int],
['ringfs_scan', [POINTER(StructRingFS)], c_int],
['ringfs_capacity', [POINTER(StructRingFS)], c_int],
Expand Down