diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-04-23 20:23:45 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-04-23 20:23:45 +0200 |
| commit | e719450c3881d0b13427f87f4d2eb91ec1151f2f (patch) | |
| tree | 2e0cb5b789fa42efa6ba7412d6840257627bcb11 | |
| parent | 4ac5cb9a72586cb1b9e48bb3fb13b1b13d967d3e (diff) | |
| download | libgphoto2-e719450c3881d0b13427f87f4d2eb91ec1151f2f.tar.gz | |
small warning fixes. use calloc instead of mnalloc/memset
| -rw-r--r-- | camlibs/canon/library.c | 7 | ||||
| -rw-r--r-- | camlibs/canon/serial.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/camlibs/canon/library.c b/camlibs/canon/library.c index 39343c3f0..6c7df74eb 100644 --- a/camlibs/canon/library.c +++ b/camlibs/canon/library.c @@ -20,7 +20,7 @@ * ****************************************************************************/ -#define _BSD_SOURCE +#define _DEFAULT_SOURCE #include "config.h" @@ -2549,10 +2549,9 @@ camera_init (Camera *camera, GPContext *context) /* Set up the CameraFilesystem */ gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera); - camera->pl = malloc (sizeof (CameraPrivateLibrary)); + camera->pl = calloc (1, sizeof (CameraPrivateLibrary)); if (!camera->pl) - return (GP_ERROR_NO_MEMORY); - memset (camera->pl, 0, sizeof (CameraPrivateLibrary)); + return GP_ERROR_NO_MEMORY; camera->pl->first_init = 1; camera->pl->seq_tx = 1; camera->pl->seq_rx = 1; diff --git a/camlibs/canon/serial.c b/camlibs/canon/serial.c index f9f729bbe..b175a5408 100644 --- a/camlibs/canon/serial.c +++ b/camlibs/canon/serial.c @@ -12,7 +12,7 @@ * ****************************************************************************/ -#define _BSD_SOURCE +#define _DEFAULT_SOURCE #include "config.h" |