diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog index 59f8ab05b..ccfd88e68 100644 --- a/libgphoto2_port/ChangeLog +++ b/libgphoto2_port/ChangeLog @@ -1,3 +1,8 @@ +2001-10-14 Lutz Müller + + * include/gphoto2-port-result.h: GP_ERROR_NO_MEMORY + * libgphoto2_port/result.c: GP_ERROR_NO_MEMORY + 2001-10-12 Lutz Müller Patch from Fredrik : diff --git a/libgphoto2_port/include/gphoto2-port-result.h b/libgphoto2_port/include/gphoto2-port-result.h index 8bcdf7bf3..9fe503fb2 100644 --- a/libgphoto2_port/include/gphoto2-port-result.h +++ b/libgphoto2_port/include/gphoto2-port-result.h @@ -27,7 +27,7 @@ #define GP_ERROR -1 #define GP_ERROR_BAD_PARAMETERS -2 -#define GP_ERROR_MEMORY -3 +#define GP_ERROR_NO_MEMORY -3 #define GP_ERROR_LIBRARY -4 #define GP_ERROR_TIMEOUT -10 diff --git a/libgphoto2_port/libgphoto2_port/debug.c b/libgphoto2_port/libgphoto2_port/debug.c index a41935f8c..f990745c5 100644 --- a/libgphoto2_port/libgphoto2_port/debug.c +++ b/libgphoto2_port/libgphoto2_port/debug.c @@ -258,7 +258,7 @@ gp_port_debug_history_set_size (unsigned int size) sizeof (char) * size); if (!new_debug_history) - return (GP_ERROR_MEMORY); + return (GP_ERROR_NO_MEMORY); debug_history_size = size; debug_history = new_debug_history; diff --git a/libgphoto2_port/libgphoto2_port/gp_port.c b/libgphoto2_port/libgphoto2_port/gp_port.c index cdcadd90b..b111d1434 100644 --- a/libgphoto2_port/libgphoto2_port/gp_port.c +++ b/libgphoto2_port/libgphoto2_port/gp_port.c @@ -141,7 +141,7 @@ gp_port_new (gp_port **dev, gp_port_type type) *dev = malloc (sizeof (gp_port)); if (!(*dev)) - return (GP_ERROR_MEMORY); + return (GP_ERROR_NO_MEMORY); memset (*dev, 0, sizeof (gp_port)); result = gp_port_library_load (*dev, type); diff --git a/libgphoto2_port/libgphoto2_port/result.c b/libgphoto2_port/libgphoto2_port/result.c index 492b98690..4009f4662 100644 --- a/libgphoto2_port/libgphoto2_port/result.c +++ b/libgphoto2_port/libgphoto2_port/result.c @@ -57,7 +57,7 @@ gp_port_result_as_string (int result) GP_ERR_RES (GP_ERROR_IO_SUPPORTED_IEEE1394, "IEEE1394 port not supported"); GP_ERR_RES (GP_ERROR_IO_UNKNOWN_PORT, "Unknown port"); - GP_ERR_RES (GP_ERROR_MEMORY, "Out of memory"); + GP_ERR_RES (GP_ERROR_NO_MEMORY, "Out of memory"); GP_ERR_RES (GP_ERROR_LIBRARY, "Error loading a required library"); GP_ERR_RES (GP_ERROR_IO_INIT, "Error initializing the port"); GP_ERR_RES (GP_ERROR_IO_OPEN, "Error opening the port");