2001-10-14 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-port-result.h: GP_ERROR_NO_MEMORY
* libgphoto2_port/result.c: GP_ERROR_NO_MEMORY
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2516 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
2001-10-14 Lutz Müller <urc8@rz.uni-karlsruhe.de>
|
||||
|
||||
* include/gphoto2-port-result.h: GP_ERROR_NO_MEMORY
|
||||
* libgphoto2_port/result.c: GP_ERROR_NO_MEMORY
|
||||
|
||||
2001-10-12 Lutz Müller <urc8@rz.uni-karlsruhe.de>
|
||||
|
||||
Patch from Fredrik <fredrik@krixor.xy.org>:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user