Changeset 552e595131c5f1d66eba8e3c22c2b1c509be5153

Timestamp:

09/18/07 18:20:49 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[7c7854e76cda10120edb95c9e3a8ab2345be2631]

git-author:

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

Message:

Replace strerror() with %m (or Linux DVB: strerror_r) - refs #1297

Files:

• modules/access/directory.c (modified) (3 diffs)
• modules/access/dv.c (modified) (5 diffs)
• modules/access/dvb/access.c (modified) (2 diffs)
• modules/access/dvb/en50221.c (modified) (3 diffs)
• modules/access/dvb/linux_dvb.c (modified) (23 diffs)
• modules/access/file.c (modified) (3 diffs)
• modules/access/mms/mmstu.c (modified) (1 diff)
• modules/access/pvr.c (modified) (6 diffs)
• modules/access/smb.c (modified) (7 diffs)
• modules/access/v4l.c (modified) (16 diffs)
• modules/access/v4l2.c (modified) (9 diffs)
• modules/access_filter/dump.c (modified) (5 diffs)
• modules/access_filter/record.c (modified) (1 diff)
• modules/access_filter/timeshift.c (modified) (1 diff)
• modules/access_output/file.c (modified) (1 diff)
• modules/access_output/udp.c (modified) (2 diffs)
• modules/audio_output/alsa.c (modified) (1 diff)
• modules/audio_output/esd.c (modified) (1 diff)
• modules/audio_output/file.c (modified) (4 diffs)
• modules/audio_output/hd1000a.cpp (modified) (1 diff)
• modules/audio_output/oss.c (modified) (1 diff)
• modules/codec/subtitles/subsdec.c (modified) (1 diff)
• modules/control/http/macro.c (modified) (1 diff)
• modules/control/http/mvar.c (modified) (1 diff)
• modules/control/http/util.c (modified) (2 diffs)
• modules/control/rc.c (modified) (3 diffs)
• modules/gui/ncurses.c (modified) (1 diff)
• modules/gui/qnx/aout.c (modified) (2 diffs)
• modules/misc/freetype.c (modified) (2 diffs)
• modules/misc/gnutls.c (modified) (2 diffs)
• modules/misc/notify/growl.c (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (1 diff)
• modules/video_output/fb.c (modified) (8 diffs)
• modules/video_output/x11/xcommon.c (modified) (3 diffs)

modules/access/directory.c

@@ -378 +378 @@
-    if ((fd == -1) || fstat (fd, &stself.st))
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -406 +405 @@
-    if( i_dir_content == -1 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -552 +550 @@
-        int err = errno;
-        if (err != ENOTDIR)
-s", path, strerror (err)
+m", path
-        else
-            msg_Dbg (obj, "skipping non-directory `%s'", path);

modules/access/dv.c

@@ -470 +470 @@
-    if ( !( handle = raw1394_new_handle() ) )
-    {
-s.\n", strerror( errno )
+m."
-        return VLC_EGENERIC;
-    }
@@ -476 +476 @@
-    if ( ( n_ports = raw1394_get_port_info( handle, pinf, 16 ) ) < 0 )
-    {
-s.\n", strerror( errno )
+m.\n"
-        raw1394_destroy_handle( handle );
-        return VLC_EGENERIC;
@@ -502 +502 @@
-    if ( !handle )
-    {
-s.\n", strerror( errno )
+m."
-        return NULL;
-    }
@@ -508 +508 @@
-    if ( ( n_ports = raw1394_get_port_info( handle, pinf, 16 ) ) < 0 )
-    {
-s.\n", strerror( errno )
+m."
-        raw1394_destroy_handle( handle );
-        return NULL;
@@ -516 +516 @@
-    if ( raw1394_set_port( handle, port ) < 0 )
-    {
-s.\n", strerror( errno )
+m."
-        return NULL;
-    }

modules/access/dvb/access.c

@@ -434 +434 @@
-                continue;
-
-s", strerror(errno)
+m"
-            return NULL;
-        }
@@ -493 +493 @@
-                                p_sys->i_read_once * TS_PACKET_SIZE ) ) <= 0 )
-            {
-s)", strerror(errno)
+m)"
-                block_Release( p_block );
-                continue;

modules/access/dvb/en50221.c

@@ -231 +231 @@
-    if ( write( p_sys->i_ca_handle, p_data, i_size ) != i_size )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -276 +275 @@
-    if ( i_size < 5 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -816 +814 @@
-            if ( i_ret < 0 )
-            {
-s", strerror(errno)
+m"
-                i_ret = VLC_EGENERIC;
-            }

modules/access/dvb/linux_dvb.c

@@ -111 +111 @@
-    if( (p_sys->i_frontend_handle = open(frontend, O_RDWR | O_NONBLOCK)) < 0 )
-    {
-
-
+
-        free( p_frontend );
-        return VLC_EGENERIC;
@@ -297 +296 @@
-                return; /* no more events */
-
- %s
-, strerror(errno)
+: %m
+
-            return;
-        }
@@ -380 +379 @@
-                        &p_frontend->info )) < 0 )
-    {
-
-
+
+
+
-        goto out;
-    }
@@ -467 +467 @@
-           < 0 )
-    {
-
-
+
+
+
+
-        goto out;
-    }
@@ -524 +526 @@
-                        &p_frontend->info )) < 0 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -808 +809 @@
-    if( (i_err = ioctl( p_sys->i_frontend_handle, FE_SET_TONE, SEC_TONE_OFF )) < 0 )
-    {
-
-
-
+
+
-        return i_err;
-    }
@@ -817 +817 @@
-    if( (i_err = ioctl( p_sys->i_frontend_handle, FE_SET_VOLTAGE, fe_voltage )) < 0 )
-    {
-s
-, strerror(errno)
+m
+
-        return i_err;
-    }
@@ -827 +827 @@
-    {
-        msg_Err( p_access,
-s
-, strerror(errno)
+m
+
-    }
-
@@ -855 +855 @@
-                           &cmd.cmd )) < 0 )
-        {
-s
-, strerror(errno)
+m
+
-            return i_err;
-        }
@@ -866 +866 @@
-                      ((val.i_int - 1) % 2) ? SEC_MINI_B : SEC_MINI_A )) < 0 )
-        {
-s
-, strerror(errno)
+m
+
-            return i_err;
-        }
@@ -876 +876 @@
-    if( (i_err = ioctl( p_sys->i_frontend_handle, FE_SET_TONE, fe_tone )) < 0 )
-    {
-
-
-
+
+
-        return i_err;
-    }
@@ -991 +990 @@
-    if( (i_ret = ioctl( p_sys->i_frontend_handle, FE_SET_FRONTEND, &fep )) < 0 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -1036 +1034 @@
-    if( (i_ret = ioctl( p_sys->i_frontend_handle, FE_SET_FRONTEND, &fep )) < 0 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -1172 +1169 @@
-    if( (ret = ioctl( p_sys->i_frontend_handle, FE_SET_FRONTEND, &fep )) < 0 )
-    {
-
-
+
-        return -1;
-    }
@@ -1209 +1205 @@
-    if( (i_ret = ioctl( p_sys->i_frontend_handle, FE_SET_FRONTEND, &fep )) < 0 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -1248 +1243 @@
-    if( (*pi_fd = open(dmx, O_RDWR)) < 0 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -1355 +1349 @@
-    if( (i_ret = ioctl( *pi_fd, DMX_SET_PES_FILTER, &s_filter_params )) < 0 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -1371 +1364 @@
-    if( (i_ret = ioctl( i_fd, DMX_STOP )) < 0 )
-    {
-
-
+
-        return i_ret;
-    }
@@ -1411 +1403 @@
-    if( (p_sys->i_handle = open(dvr, O_RDONLY)) < 0 )
-    {
-
-
+
-        return VLC_EGENERIC;
-    }
@@ -1418 +1409 @@
-    if( fcntl( p_sys->i_handle, F_SETFL, O_NONBLOCK ) == -1 )
-    {
-
-
+
-    }
-
@@ -1463 +1453 @@
-    if( (p_sys->i_ca_handle = open(ca, O_RDWR | O_NONBLOCK)) < 0 )
-    {
-
-
+
-        p_sys->i_ca_handle = 0;
-        return VLC_EGENERIC;
@@ -1687 +1676 @@
-    if ( ioctl( p_sys->i_ca_handle, CA_GET_CAP, &caps ) != 0 )
-    {
-
-
+
+
+
-        goto out;
-    }
@@ -1729 +1719 @@
-        if ( ioctl( p_sys->i_ca_handle, CA_GET_SLOT_INFO, &sinfo ) != 0 )
-        {
-
-
+
+
+
-            continue;
-        }

modules/access/file.c

@@ -169 +169 @@
-    {
-        if (fstat (fd, &st))
-s", fd, strerror (errno)
+m", fd
-        else
-        if (S_ISDIR (st.st_mode))
@@ -278 +278 @@
-
-            default:
-
+
+
-                intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
-                                _("VLC could not read file \"%s\"."),
@@ -446 +447 @@
-    if (fd == -1)
-    {
-
-
+
-        intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
-                        _("VLC could not open file \"%s\" (%s)."),

modules/access/mms/mmstu.c

@@ -1043 +1043 @@
-    if( i_ret < 0 )
-    {
-s)", strerror(errno)
+m)"
-        return -1;
-    }

modules/access/pvr.c

@@ -832 +832 @@
-    if( p_sys->i_fd < 0 )
-    {
-s).", strerror( errno )
+m)."
-        Close( VLC_OBJECT(p_access) );
-        return VLC_EGENERIC;
@@ -937 +937 @@
-            if( p_sys->i_radio_fd < 0 )
-            {
-
-
+
-                Close( VLC_OBJECT(p_access) );
-                return VLC_EGENERIC;
@@ -955 +954 @@
-        if ( result < 0 )
-        {
-
-
+
-        }
-        else
@@ -968 +966 @@
-            if ( result < 0 )
-            {
-
-
+
-            }
-            else
@@ -981 +978 @@
-                if( result < 0 )
-                {
-
-
+
-                }
-                else
@@ -1091 +1087 @@
-    if( i_ret < 0 )
-    {
-Select error (%s).", strerror( errno )
+Polling error (%m)."
-        return -1;
-    }

modules/access/smb.c

@@ -221 +221 @@
-    if( !smbc_init_context( p_smb ) )
-    {
-s)", strerror(errno)
+m)"
-        smbc_free_context( p_smb, 1 );
-        free( psz_uri );
@@ -229 +229 @@
-    if( !(p_file = (p_smb->open)( p_smb, psz_uri, O_RDONLY, 0 )) )
-    {
-s
-, strerror(errno)
+m
+
-        smbc_free_context( p_smb, 1 );
-        free( psz_uri );
@@ -240 +240 @@
-
-    i_ret = p_smb->fstat( p_smb, p_file, &filestat );
-s)", strerror(errno)
+m)"
-    else p_access->info.i_size = filestat.st_size;
-#else
@@ -262 +262 @@
-    if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 )
-    {
-s
-, strerror(errno)
+m
+
-        free( psz_uri );
-        return VLC_EGENERIC;
@@ -272 +272 @@
-
-    i_ret = smbc_fstat( i_smb, &filestat );
-
+
+
+
+
+
-    else p_access->info.i_size = filestat.st_size;
-#endif
@@ -332 +336 @@
-    if( i_ret == -1 )
-    {
-s)", strerror(errno)
+m)"
-        return VLC_EGENERIC;
-    }
@@ -359 +363 @@
-    if( i_read < 0 )
-    {
-s)", strerror(errno)
+m)"
-        return -1;
-    }

modules/access/v4l.c

@@ -879 +879 @@
-    if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
-    {
-s)", strerror( errno )
+m)"
-        goto vdev_failed;
-    }
@@ -885 +885 @@
-    if( ioctl( i_fd, VIDIOCGCAP, &p_sys->vid_cap ) < 0 )
-    {
-s)", strerror( errno )
+m)"
-        goto vdev_failed;
-    }
@@ -930 +930 @@
-    if( ioctl( i_fd, VIDIOCGCHAN, &vid_channel ) < 0 )
-    {
-
-
+
-        goto vdev_failed;
-    }
@@ -948 +947 @@
-    if( ioctl( i_fd, VIDIOCSCHAN, &vid_channel ) < 0 )
-    {
-s)", strerror( errno )
+m)"
-        goto vdev_failed;
-    }
@@ -963 +962 @@
-            if( ioctl( i_fd, VIDIOCGTUNER, &vid_tuner ) < 0 )
-            {
-s)", strerror( errno )
+m)"
-                goto vdev_failed;
-            }
@@ -978 +977 @@
-            if( ioctl( i_fd, VIDIOCSTUNER, &vid_tuner ) < 0 )
-            {
-s)", strerror( errno )
+m)"
-                goto vdev_failed;
-            }
@@ -994 +993 @@
-            if( ioctl( i_fd, VIDIOCSFREQ, &driver_frequency ) < 0 )
-            {
-
-
+
-                goto vdev_failed;
-            }
@@ -1014 +1012 @@
-            if( ioctl( i_fd, VIDIOCGAUDIO, &vid_audio ) < 0 )
-            {
-s)", strerror( errno )
+m)"
-                goto vdev_failed;
-            }
@@ -1023 +1021 @@
-            if( ioctl( i_fd, VIDIOCSAUDIO, &vid_audio ) < 0 )
-            {
-s)", strerror( errno )
+m)"
-                goto vdev_failed;
-            }
@@ -1039 +1037 @@
-        if( ioctl( i_fd, MJPIOC_G_PARAMS, &mjpeg ) < 0 )
-        {
-
-
+
-            goto vdev_failed;
-        }
@@ -1090 +1087 @@
-        if( ioctl( i_fd, MJPIOC_S_PARAMS, &mjpeg ) < 0 )
-        {
-
-
+
-            goto vdev_failed;
-        }
@@ -1107 +1103 @@
-        if( ioctl( i_fd, VIDIOCGWIN, &vid_win ) < 0 )
-        {
-s)", strerror( errno )
+m)"
-            goto vdev_failed;
-        }
@@ -1337 +1333 @@
-    if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 )
-    {
-s)", strerror( errno )
+m)"
-        goto adev_fail;
-    }
@@ -1346 +1342 @@
-    {
-        msg_Err( p_demux, "cannot set audio format (16b little endian) "
-s)", strerror( errno )
+m)"
-        goto adev_fail;
-    }
@@ -1353 +1349 @@
-               &p_sys->b_stereo ) < 0 )
-    {
-
-
+
-        goto adev_fail;
-    }
@@ -1361 +1356 @@
-               &p_sys->i_sample_rate ) < 0 )
-    {
-
-
+
-        goto adev_fail;
-    }

modules/access/v4l2.c

@@ -189 +189 @@
-    if( ( i_fd = open( p_sys->psz_device, O_RDWR ) ) < 0 )
-    {
-s)", strerror( errno )
+m)"
-        goto open_failed;
-    }
@@ -204 +204 @@
-    if( ioctl( i_fd, VIDIOC_S_INPUT, &p_sys->i_selected_input ) < 0 )
-    {
-s)", strerror( errno )
+m)"
-       goto open_failed;
-    }
@@ -218 +218 @@
-        if( ioctl( i_fd, VIDIOC_REQBUFS, &reqbuf ) < 0 )
-        {
-s
-, strerror( errno )
+m
+
-            goto open_failed;
-        }
@@ -251 +251 @@
-    if( ( i_fd = open( p_sys->psz_device, O_RDWR ) ) < 0 )
-    {
-s)", strerror( errno )
+m)"
-        goto open_failed;
-    }
@@ -259 +259 @@
-    if( ioctl( i_fd, VIDIOC_QUERYCAP, &p_sys->dev_cap ) < 0 )
-    {
-s)", strerror( errno )
+m)"
-        goto open_failed;
-    }
@@ -306 +306 @@
-            if( ioctl( i_fd, VIDIOC_ENUMINPUT, &p_sys->p_inputs[i_index] ) )
-            {
- "cannot get video input characteristics (%s)",
-                        strerror( errno )
+
+"cannot get video input characteristics (%m)"
-                goto open_failed;
-            }
@@ -335 +335 @@
-            if( ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 )
-            {
- "cannot get video input characteristics (%s)",
-                        strerror( errno )
+
+"cannot get video input characteristics (%m)"
-                goto open_failed;
-            }
@@ -372 +372 @@
-            if( ioctl( i_fd, VIDIOC_G_TUNER, &p_sys->p_tuners[i_index] ) )
-            {
-
-
+
-                goto open_failed;
-            }
@@ -422 +421 @@
-            if( ioctl( i_fd, VIDIOC_ENUM_FMT, &p_sys->p_codecs[i_index] ) < 0 )
-            {
-s)", strerror( errno )
+m)"
-                goto open_failed;
-            }

modules/access_filter/dump.c

@@ -112 +112 @@
-    if ((p_sys->stream = tmpfile ()) == NULL)
-    {
-s", strerror (errno)
+m"
-        free (p_sys);
-        return VLC_EGENERIC;
@@ -168 +168 @@
-    if (fwrite (buffer, len, 1, stream) != 1)
-    {
-s", strerror (errno)
+m"
-        goto error;
-    }
@@ -295 +295 @@
-    if (newstream == NULL)
-    {
-
-
+
-        return;
-    }
@@ -312 +311 @@
-            if (ferror (oldstream))
-            {
-
-
+
-                break;
-            }
@@ -326 +324 @@
-        if (fwrite (buf, len, 1, newstream) != 1)
-        {
-s", strerror (errno)
+m"
-            break;
-        }

modules/access_filter/record.c

@@ -448 +448 @@
-        if( p_sys->f == NULL )
-        {
-s
-, strerror(errno)
+m
+
-            free( p_sys->psz_file );
-            p_sys->psz_file = NULL;

modules/access_filter/timeshift.c

@@ -423 +423 @@
-        {
-            /* We just can't work with less than 2 buffer files */
-s
-, strerror(errno)
+m
+
-            return VLC_EGENERIC;
-        }

modules/access_output/file.c

@@ -139 +139 @@
-        if( fd == -1 )
-        {
-
-
+
-            free( p_access->p_sys );
-            return( VLC_EGENERIC );

modules/access_output/udp.c

@@ -466 +466 @@
-    mtime_t              i_to_send = p_thread->i_group;
-    int                  i_dropped_packets = 0;
-#if defined(WIN32) || defined(UNDER_CE)
-    char strerror_buf[WINSOCK_STRERROR_SIZE];
-# define strerror( x ) winsock_strerror( strerror_buf )
-#endif
-
-    while( !p_thread->b_die )
@@ -524 +520 @@
-        if (val == -1)
-        {