From 5dc380594ad755dd5a9d2cad246e5dcb5480350d Mon Sep 17 00:00:00 2001 From: Jonathan Beck Date: Sun, 31 Aug 2008 18:43:29 +0200 Subject: prefix public enum with IPHONE_ --- include/libiphone/libiphone.h | 26 +++++++++++++------------- src/AFC.c | 2 +- src/ifuse.c | 10 +++++----- src/main.c | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/libiphone/libiphone.h b/include/libiphone/libiphone.h index 249b9b3..2e66b5d 100644 --- a/include/libiphone/libiphone.h +++ b/include/libiphone/libiphone.h @@ -48,18 +48,18 @@ extern "C" { //afc specific error #define IPHONE_E_NO_SUCH_FILE -12 -typedef short iphone_error_t; - -enum { - AFC_FILE_READ = 0x00000002, // seems to be able to read and write files - AFC_FILE_WRITE = 0x00000003, // writes and creates a file, blanks it out, etc. - AFC_FILE_RW = 0x00000005, // seems to do the same as 2. Might even create the file. - AFC_FILE_OP4 = 0x00000004, // no idea -- appears to be "write" -- clears file beforehand like 3 - AFC_FILE_OP6 = 0x00000006, // no idea yet -- appears to be the same as 5. - AFC_FILE_OP1 = 0x00000001, // no idea juuust yet... probably read. - AFC_FILE_OP0 = 0x00000000, - AFC_FILE_OP10 = 0x0000000a -}; +typedef int16_t iphone_error_t; + +typedef enum { + IPHONE_AFC_FILE_READ = 0x00000002, // seems to be able to read and write files + IPHONE_AFC_FILE_WRITE = 0x00000003, // writes and creates a file, blanks it out, etc. + IPHONE_AFC_FILE_RW = 0x00000005, // seems to do the same as 2. Might even create the file. + IPHONE_AFC_FILE_OP4 = 0x00000004, // no idea -- appears to be "write" -- clears file beforehand like 3 + IPHONE_AFC_FILE_OP6 = 0x00000006, // no idea yet -- appears to be the same as 5. + IPHONE_AFC_FILE_OP1 = 0x00000001, // no idea juuust yet... probably read. + IPHONE_AFC_FILE_OP0 = 0x00000000, + IPHONE_AFC_FILE_OP10 = 0x0000000a +} iphone_afc_file_mode_t; struct iphone_device_int; typedef struct iphone_device_int *iphone_device_t; @@ -106,7 +106,7 @@ iphone_error_t iphone_afc_get_devinfo ( iphone_afc_client_t client, char ***info iphone_error_t iphone_afc_get_dir_list ( iphone_afc_client_t client, const char *dir, char ***list); iphone_error_t iphone_afc_get_file_attr ( iphone_afc_client_t client, const char *filename, struct stat *stbuf ); -iphone_error_t iphone_afc_open_file ( iphone_afc_client_t client, const char *filename, uint32_t file_mode, iphone_afc_file_t *file ); +iphone_error_t iphone_afc_open_file ( iphone_afc_client_t client, const char *filename, iphone_afc_file_mode_t file_mode, iphone_afc_file_t *file ); iphone_error_t iphone_afc_close_file ( iphone_afc_client_t client, iphone_afc_file_t file); iphone_error_t iphone_afc_read_file ( iphone_afc_client_t client, iphone_afc_file_t file, char *data, int length, uint32_t *bytes); iphone_error_t iphone_afc_write_file ( iphone_afc_client_t client, iphone_afc_file_t file, const char *data, int length, uint32_t *bytes); diff --git a/src/AFC.c b/src/AFC.c index d2bae97..3828519 100644 --- a/src/AFC.c +++ b/src/AFC.c @@ -625,7 +625,7 @@ iphone_error_t iphone_afc_get_file_attr ( iphone_afc_client_t client, const char * received by afc_get_file_info) as well as the handle to the file or * NULL in the case of failure. */ -iphone_error_t iphone_afc_open_file ( iphone_afc_client_t client, const char *filename, uint32_t file_mode, iphone_afc_file_t *file ) { +iphone_error_t iphone_afc_open_file ( iphone_afc_client_t client, const char *filename, iphone_afc_file_mode_t file_mode, iphone_afc_file_t *file ) { iphone_afc_file_t file_loc = NULL; uint32 ag = 0; int bytes = 0, length = 0; diff --git a/src/ifuse.c b/src/ifuse.c index 6d2bae0..353188e 100644 --- a/src/ifuse.c +++ b/src/ifuse.c @@ -76,7 +76,7 @@ static int ifuse_create(const char *path, mode_t mode, struct fuse_file_info *fi iphone_afc_file_t file; iphone_afc_client_t afc = fuse_get_context()->private_data; - iphone_afc_open_file(afc, path, AFC_FILE_WRITE, &file); + iphone_afc_open_file(afc, path, IPHONE_AFC_FILE_WRITE, &file); fh_index++; fi->fh = fh_index; g_hash_table_insert(file_handles, &fh_index, file); @@ -89,11 +89,11 @@ static int ifuse_open(const char *path, struct fuse_file_info *fi) { uint32_t mode = 0; if ((fi->flags & 3) == O_RDWR || (fi->flags & 3) == O_WRONLY) { - mode = AFC_FILE_READ; + mode = IPHONE_AFC_FILE_READ; } else if ((fi->flags & 3) == O_RDONLY) { - mode = AFC_FILE_READ; + mode = IPHONE_AFC_FILE_READ; } else { - mode = AFC_FILE_READ; + mode = IPHONE_AFC_FILE_READ; } iphone_afc_open_file(afc, path, mode, &file); @@ -235,7 +235,7 @@ int ifuse_truncate(const char *path, off_t size) { int result = 0; iphone_afc_client_t afc = fuse_get_context()->private_data; iphone_afc_file_t tfile = NULL; - iphone_afc_open_file(afc, path, AFC_FILE_READ, &tfile); + iphone_afc_open_file(afc, path, IPHONE_AFC_FILE_READ, &tfile); if (!tfile) return -1; result = iphone_afc_truncate_file(afc, tfile, size); diff --git a/src/main.c b/src/main.c index fd8e0fe..dd6e51b 100644 --- a/src/main.c +++ b/src/main.c @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) { iphone_afc_file_t my_file = NULL; struct stat stbuf; iphone_afc_get_file_attr ( afc, "/iTunesOnTheGoPlaylist.plist", &stbuf ); - if (IPHONE_E_SUCCESS == iphone_afc_open_file(afc, "/iTunesOnTheGoPlaylist.plist", AFC_FILE_READ, &my_file) && my_file) { + if (IPHONE_E_SUCCESS == iphone_afc_open_file(afc, "/iTunesOnTheGoPlaylist.plist", IPHONE_AFC_FILE_READ, &my_file) && my_file) { printf("A file size: %i\n", stbuf.st_size); char *file_data = (char*)malloc(sizeof(char) * stbuf.st_size); iphone_afc_read_file(afc, my_file, file_data, stbuf.st_size, &bytes); @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) { free(file_data); } else printf("couldn't open a file\n"); - iphone_afc_open_file(afc, "/readme.libiphone.fx", AFC_FILE_WRITE, &my_file); + iphone_afc_open_file(afc, "/readme.libiphone.fx", IPHONE_AFC_FILE_WRITE, &my_file); if (my_file) { char *outdatafile = strdup("this is a bitchin text file\n"); iphone_afc_write_file(afc, my_file, outdatafile, strlen(outdatafile), &bytes); @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) { else printf("Failure. (expected unless you have a /renme file on your phone)\n"); printf("Seek & read\n"); - iphone_afc_open_file(afc, "/readme.libiphone.fx", AFC_FILE_READ, &my_file); + iphone_afc_open_file(afc, "/readme.libiphone.fx", IPHONE_AFC_FILE_READ, &my_file); if (IPHONE_E_SUCCESS != iphone_afc_seek_file(afc, my_file, 5)) printf("WARN: SEEK DID NOT WORK\n"); char *threeletterword = (char*)malloc(sizeof(char) * 5); iphone_afc_read_file(afc, my_file, threeletterword, 3, &bytes); -- cgit v1.1-32-gdbae