diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2006-11-19 20:49:37 +0000 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2006-11-19 20:49:37 +0000 |
commit | 5643436a649357547d99fae8f093cede99e82eca (patch) | |
tree | 3b72f84bd904452b100782535d81a5cd98947783 /camlibs/sx330z | |
parent | f0bb3c41494dfb9f7268e75b287a0bca6444354b (diff) | |
download | libgphoto2-5643436a649357547d99fae8f093cede99e82eca.tar.gz |
made some functions static.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9436 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sx330z')
-rw-r--r-- | camlibs/sx330z/library.c | 2 | ||||
-rw-r--r-- | camlibs/sx330z/sx330z.c | 8 | ||||
-rw-r--r-- | camlibs/sx330z/sx330z.h | 10 |
3 files changed, 5 insertions, 15 deletions
diff --git a/camlibs/sx330z/library.c b/camlibs/sx330z/library.c index 7ce00eede..c6ae004ff 100644 --- a/camlibs/sx330z/library.c +++ b/camlibs/sx330z/library.c @@ -67,7 +67,7 @@ * please report if you have others that are working */ -static struct +static const struct { char *model; int usb_vendor; diff --git a/camlibs/sx330z/sx330z.c b/camlibs/sx330z/sx330z.c index d1f3b2fd0..ac6a474c4 100644 --- a/camlibs/sx330z/sx330z.c +++ b/camlibs/sx330z/sx330z.c @@ -32,7 +32,7 @@ #include "gphoto2-endian.h" /*convert to correct endianness */ -int +static int sx330z_fill_req(int8_t *buf, struct traveler_req *req) { *((int16_t*)buf) = htole16(req->always1); buf += 2; @@ -46,7 +46,7 @@ sx330z_fill_req(int8_t *buf, struct traveler_req *req) } /* sx330z_fill_req */ /*convert to correct endianness */ -int +static int sx330z_fill_ack(int8_t *buf, struct traveler_ack *ack) { ack->always3 = le32toh(*(int32_t*)buf); buf += 4; @@ -57,7 +57,7 @@ sx330z_fill_ack(int8_t *buf, struct traveler_ack *ack) } /* sx330z_fill_ack */ /*convert to correct endianness */ -int +static int sx330z_fill_toc_page(int8_t *buf, struct traveler_toc_page *toc) { int cnt; @@ -93,7 +93,7 @@ sx330z_init(Camera *camera, GPContext *context) /* * Read block described by req */ -int +static int sx330z_read_block(Camera *camera, GPContext *context, struct traveler_req *req, char *buf) { int ret; diff --git a/camlibs/sx330z/sx330z.h b/camlibs/sx330z/sx330z.h index 438d2c939..0ecea7a29 100644 --- a/camlibs/sx330z/sx330z.h +++ b/camlibs/sx330z/sx330z.h @@ -100,11 +100,6 @@ struct traveler_ack }; -/* endianness handling */ -int sx330z_fill_req(int8_t *buf,struct traveler_req *req); -int sx330z_fill_ack(int8_t *buf,struct traveler_ack *ack); -int sx330z_fill_toc_page(int8_t *buf,struct traveler_toc_page *toc); - /* * There's not a real initialization, * but ... @@ -119,11 +114,6 @@ int sx330z_get_toc_num_pages(Camera *camera,GPContext *context, int32_t *pages); /* - * Read a data-block (TOC / Image) - */ -int sx330z_read_block(Camera *camera,GPContext *context,struct traveler_req *req,char *buf); - -/* * Get TOC */ int sx330z_get_toc_page(Camera *camera,GPContext *context,struct traveler_toc_page *toc,int page); |