Changeset 4ff9961862088bf74ca36f04ae3e34094ec9778f

Timestamp:

09/18/07 17:44:47 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1190130287 +0000

git-parent:

[357771f9fee9241d5d9fa0262c4558c3fd57948c]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1190130287 +0000

Message:

Fix the most common strerror() usages (threads, network, input) - refs #1297

Files:

• include/vlc_common.h (modified) (1 diff)
• include/vlc_network.h (modified) (1 diff)
• include/vlc_threads_funcs.h (modified) (16 diffs)
• src/input/meta.c (modified) (2 diffs)
• src/misc/threads.c (modified) (10 diffs)
• src/network/acl.c (modified) (3 diffs)
• src/network/httpd.c (modified) (1 diff)
• src/network/io.c (modified) (8 diffs)
• src/network/tcp.c (modified) (6 diffs)
• src/network/udp.c (modified) (10 diffs)
• src/stream_output/sap.c (modified) (1 diff)
• src/stream_output/stream_output.c (modified) (1 diff)

include/vlc_common.h

@@ -65 +65 @@
-#include <stdarg.h>
-
-                                         /* strerror() */
+
-#include <stdio.h>
-

include/vlc_network.h

@@ -64 +64 @@
-#   include <netdb.h>
-#   define net_errno errno
-#   define net_strerror strerror
-#endif
-

include/vlc_threads_funcs.h

@@ -82 +82 @@
-    /* In case of error : */
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
@@ -127 +126 @@
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-psz_error = strerror(i_result)
+errno = i_result
-    }
-
@@ -139 +138 @@
-    {
-        msg_Err( p_mutex->p_this,
-s
-, psz_error
+m
+
-    }
-    return i_result;
@@ -161 +160 @@
-    /* In case of error : */
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
@@ -204 +202 @@
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-psz_error = strerror(i_result)
+errno = i_result
-    }
-
@@ -216 +214 @@
-    {
-        msg_Err( p_mutex->p_this,
-s
-, psz_error
+m
+
-    }
-
@@ -247 +245 @@
-    /* In case of error : */
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
@@ -342 +339 @@
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-psz_error = strerror(i_result)
+errno = i_result
-    }
-
@@ -358 +355 @@
-    {
-        msg_Err( p_condvar->p_this,
-s
-, psz_error
+m
+
-    }
-
@@ -377 +374 @@
-    /* In case of error : */
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
@@ -514 +510 @@
-    if( i_result == ETIMEDOUT )
-    {
+        errno = ETIMEDOUT;
-        msg_Dbg( p_condvar->p_this,
-                  "thread %li: possible condition deadlock "
-s
-, strerror(i_result)
+m
+
-
-        i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
@@ -529 +526 @@
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-psz_error = strerror(i_result)
+errno = i_result
-    }
-
@@ -541 +538 @@
-    {
-        msg_Err( p_condvar->p_this,
-s
-, psz_error
+m
+
-    }
-
@@ -564 +561 @@
-    int i_res;
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
@@ -589 +585 @@
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-psz_error = strerror(i_res)
+errno = i_res
-    }
-
@@ -599 +595 @@
-    {
-        msg_Err( p_condvar->p_this,
-s
-, psz_error
+m
+
-    }
-

src/input/meta.c

@@ -459 +459 @@
-
-        if( err )
-
+
+
+
+
-        else
-            msg_Dbg( p_playlist, "album art saved to %s\n", psz_filename );
@@ -546 +549 @@
-    {
-        if( fwrite( p_attachment->p_data, p_attachment->i_data, 1, f ) != 1 )
-s", psz_filename, strerror( errno )
+m", psz_filename
-        else
-            msg_Dbg( p_input, "album art saved to %s\n", psz_filename );

src/misc/threads.c

@@ -331 +331 @@
-    /* In case of error : */
-    int i_thread = -1;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
@@ -368 +367 @@
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-psz_error = strerror(i_result)
+errno = i_result
-    }
-
@@ -379 +378 @@
-    {
-        msg_Err( p_mutex->p_this,
-s
-, psz_error
+m
+
-    }
-    return i_result;
@@ -501 +500 @@
-    /* In case of error : */
-    int i_thread = -1;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
@@ -531 +529 @@
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-psz_error = strerror(i_result)
+errno = i_result
-    }
-
@@ -542 +540 @@
-    {
-        msg_Err( p_condvar->p_this,
-s
-, psz_error
+m
+
-    }
-    return i_result;
@@ -666 +664 @@
-                                               i_policy, &param )) )
-        {
-
-
+
+
+
-            i_priority = 0;
-        }
@@ -709 +708 @@
-    else
-    {
-
-
+
+
+
-        vlc_mutex_unlock( &p_this->object_lock );
-    }
@@ -763 +763 @@
-                                               i_policy, &param )) )
-        {
-
-
+
+
+
-            i_priority = 0;
-        }
@@ -882 +883 @@
-    if( i_ret )
-    {
-msg_Err( p_this, "thread_join(%u) failed at %s:%d (%s)",
-                 (unsigned int)p_priv->thread_id, psz_file, i_line
-strerror(i_ret)
+errno = i_ret;
+msg_Err( p_this, "thread_join(%u) failed at %s:%d (%m)"
+(unsigned int)p_priv->thread_id, psz_file, i_line
-    }
-    else

src/network/acl.c

@@ -318 +318 @@
-            if( ferror( file ) )
-            {
-
-
+
-                goto error;
-            }
@@ -338 +337 @@
-        if( ptr == NULL )
-        {
-\n
+
-                      psz_path);
-            do
@@ -346 +345 @@
-                     if( ferror( file ) )
-                     {
-s\n
-, strerror( errno )
+m
+
-                     }
-                     goto error;

src/network/httpd.c

@@ -2363 +2363 @@
-                {
-                    /* This is most likely a bug */
-s", strerror (errno)
+m" 
-                    msleep( 1000 );
-                }

src/network/io.c

@@ -89 +89 @@
-    {
-        if (net_errno != EAFNOSUPPORT)
-
-
+
-        return -1;
-    }
@@ -149 +148 @@
-        if (fd == -1)
-        {
-s", net_strerror (net_errno)
+m"
-            continue;
-        }
@@ -177 +176 @@
-        if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
-        {
-            int saved_errno = net_errno;
-
-            net_Close (fd);
-#if !defined(WIN32) && !defined(UNDER_CE)
@@ -191 +188 @@
-#endif
-            {
-
-
+
-                continue;
-            }
@@ -217 +213 @@
-                if (listen (fd, INT_MAX))
-                {
-
-
+
-                    net_Close (fd);
-                    continue;
@@ -363 +358 @@
-
-error:
-s", net_strerror (net_errno)
+m"
-    return i_total ? (ssize_t)i_total : -1;
-}
@@ -422 +417 @@
-        {
-            case -1:
-s", net_strerror (net_errno)
+m"
-               goto out;
-
@@ -443 +438 @@
-        if (val == -1)
-        {
-s", net_strerror (net_errno)
+m"
-            break;
-        }

src/network/tcp.c

@@ -148 +148 @@
-        if( fd == -1 )
-        {
-s", strerror( net_errno )
+m"
-            continue;
-        }
@@ -160 +160 @@
-            if( net_errno != EINPROGRESS )
-            {
-
-
+
-                goto next_ai;
-            }
@@ -200 +199 @@
-                if( ( i_ret == -1 ) && ( net_errno != EINTR ) )
-                {
-
-
+
-                    goto next_ai;
-                }
@@ -218 +216 @@
-                            &i_val_size ) == -1 || i_val != 0 )
-            {
-
-
+
-                goto next_ai;
-            }
@@ -289 +286 @@
-                if (net_errno != EINTR)
-                {
-
-
+
-                }
-                return -1;
@@ -309 +305 @@
-            if (fd == -1)
-            {
-
-
+
-                continue;
-            }

src/network/udp.c

@@ -125 +125 @@
-        if (fd == -1)
-        {
-s", net_strerror (net_errno)
+m"
-            continue;
-        }
@@ -158 +158 @@
-        if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
-        {
-s)", net_strerror (net_errno)
+m)"
-            net_Close (fd);
-            continue;
@@ -205 +205 @@
-
-        default:
-
+
+
-            return VLC_EGENERIC;
-    }
@@ -275 +276 @@
-            return 0;
-
-s", iface, net_strerror (net_errno)
+m", iface
-    }
-
@@ -293 +294 @@
-                return 0;
-
-s", addr, net_strerror (net_errno)
+m", addr
-        }
-    }
@@ -363 +364 @@
-#endif
-
-
-
+
-    return -1;
-}
@@ -386 +386 @@
-#endif
-
-
-
+
-    return -1;
-}
@@ -550 +549 @@
-    }
-
-
-
+
-
-    if (src != NULL)
@@ -688 +686 @@
-        else
-        {
-
-
+
-            net_Close( fd );
-            continue;
@@ -804 +801 @@
-              : connect (fd, ptr2->ai_addr, ptr2->ai_addrlen))
-            {
-s
-, net_strerror (net_errno)
+m
+
-                continue;
-            }

src/stream_output/sap.c

@@ -31 +31 @@
-#include <stdlib.h>                                                /* free() */
-#include <stdio.h>                                              /* sprintf() */
-                                            /* strerror() */
+
-#include <ctype.h>                                  /* tolower(), isxdigit() */
-

src/stream_output/stream_output.c

@@ -32 +32 @@
-#include <stdlib.h>                                                /* free() */
-#include <stdio.h>                                              /* sprintf() */
-                                            /* strerror() */
+
-
-#include <vlc_sout.h>