Changeset 2305 for libcaca/trunk/cucul/cucul.cTweet

Timestamp:

Apr 19, 2008, 9:25:52 PM (12 years ago)

Author:

Sam Hocevar

Message:

• Remove all unsigned ints from exported functions. Signed arithmetic is far better for error checking.

File:

• libcaca/trunk/cucul/cucul.c (modified) (10 diffs)

libcaca/trunk/cucul/cucul.c

@@ -34 +34 @@
 #include "cucul_internals.h"
 
-static int cucul_resize(cucul_canvas_t *, unsigned int, unsigned int);
+static int cucul_resize(cucul_canvas_t *, int, int);
 
 /** \brief Initialise a \e libcucul canvas.
@@ -47 +47 @@
  *
  *  If an error occurs, NULL is returned and \b errno is set accordingly:
+ *  - \c EINVAL Specified width or height is invalid.
  *  - \c ENOMEM Not enough memory for the requested canvas size.
  *
@@ -53 +54 @@
  *  \return A libcucul canvas handle upon success, NULL if an error occurred.
  */
-cucul_canvas_t * cucul_create_canvas(unsigned int width, unsigned int height)
-{
-    cucul_canvas_t *cv = malloc(sizeof(cucul_canvas_t));
+cucul_canvas_t * cucul_create_canvas(int width, int height)
+{
+    cucul_canvas_t *cv;
+
+    if(width < 0 || height < 0)
+    {
+        seterrno(EINVAL);
+        return NULL;
+    }
+
+    cv = malloc(sizeof(cucul_canvas_t));
 
     if(!cv)
@@ -191 +200 @@
  *
  *  If an error occurs, -1 is returned and \b errno is set accordingly:
+ *  - \c EINVAL Specified width or height is invalid.
  *  - \c EBUSY The canvas is in use by a display driver and cannot be resized.
  *  - \c ENOMEM Not enough memory for the requested canvas size. If this
@@ -200 +210 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_set_canvas_size(cucul_canvas_t *cv, unsigned int width,
-                                              unsigned int height)
-{
+int cucul_set_canvas_size(cucul_canvas_t *cv, int width, int height)
+{
+    if(width < 0 || height < 0)
+    {
+        seterrno(EINVAL);
+        return -1;
+    }
+
     if(cv->refcount && cv->resize_callback
         && !cv->resize_callback(cv->resize_data))
@@ -222 +237 @@
  *  \return The canvas width.
  */
-unsigned int cucul_get_canvas_width(cucul_canvas_t const *cv)
+int cucul_get_canvas_width(cucul_canvas_t const *cv)
 {
     return cv->width;
@@ -236 +251 @@
  *  \return The canvas height.
  */
-unsigned int cucul_get_canvas_height(cucul_canvas_t const *cv)
+int cucul_get_canvas_height(cucul_canvas_t const *cv)
 {
     return cv->height;
@@ -293 +308 @@
 int cucul_free_canvas(cucul_canvas_t *cv)
 {
-    unsigned int f;
+    int f;
 
     if(cv->refcount)
@@ -357 +372 @@
  */
 
-int cucul_resize(cucul_canvas_t *cv, unsigned int width, unsigned int height)
-{
-    unsigned int x, y, f, old_width, old_height, new_size, old_size;
+int cucul_resize(cucul_canvas_t *cv, int width, int height)
+{
+    int x, y, f, old_width, old_height, new_size, old_size;
 
     old_width = cv->width;
@@ -427 +442 @@
         /* New width is smaller. Copy as many lines as possible. Ignore
          * the first line, it is already in place. */
-        unsigned int lines = height < old_height ? height : old_height;
+        int lines = height < old_height ? height : old_height;
 
         for(f = 0; f < cv->framecount; f++)