diff --git a/sys/dvb/camconditionalaccess.c b/sys/dvb/camconditionalaccess.c index 50d6568b65..c09a6b7fb4 100644 --- a/sys/dvb/camconditionalaccess.c +++ b/sys/dvb/camconditionalaccess.c @@ -137,7 +137,7 @@ static CamReturn send_conditional_access_enquiry (CamConditionalAccess * cas, CamSLSession * session) { - GST_DEBUG ("sending application cas enquiry"); + GST_DEBUG ("sending application CAS enquiry"); return send_simple (cas, session, TAG_CONDITIONAL_ACCESS_INFO_ENQUIRY); } diff --git a/sys/dvb/camdevice.c b/sys/dvb/camdevice.c index 0d9085389c..0952bcf31d 100644 --- a/sys/dvb/camdevice.c +++ b/sys/dvb/camdevice.c @@ -110,11 +110,11 @@ cam_device_open (CamDevice * device, const char *filename) g_return_val_if_fail (device->state == CAM_DEVICE_STATE_CLOSED, FALSE); g_return_val_if_fail (filename != NULL, FALSE); - GST_INFO ("opening ca device %s", filename); + GST_INFO ("opening CA device %s", filename); ret = open (filename, O_RDWR); if (ret == -1) { - GST_ERROR ("can't open ca device: %s", strerror (errno)); + GST_ERROR ("can't open CA device: %s", g_strerror (errno)); return FALSE; } @@ -130,7 +130,7 @@ cam_device_open (CamDevice * device, const char *filename) /* get the capabilities of the CA */ ret = ioctl (device->fd, CA_GET_CAP, &ca_caps); if (ret == -1) { - GST_ERROR ("CA_GET_CAP ioctl failed: %s", strerror (errno)); + GST_ERROR ("CA_GET_CAP ioctl failed: %s", g_strerror (errno)); reset_state (device); return FALSE; } @@ -193,7 +193,7 @@ cam_device_close (CamDevice * device) g_return_if_fail (device != NULL); g_return_if_fail (device->state == CAM_DEVICE_STATE_OPEN); - GST_INFO ("closing ca device %s", device->filename); + GST_INFO ("closing CA device %s", device->filename); reset_state (device); } diff --git a/sys/dvb/camswclient.c b/sys/dvb/camswclient.c index 9eade780a2..12f54e34da 100644 --- a/sys/dvb/camswclient.c +++ b/sys/dvb/camswclient.c @@ -84,7 +84,7 @@ cam_sw_client_open (CamSwClient * client, const char *sock_path) GST_INFO ("connecting to softcam socket: %s", sock_path); if ((client->sock = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) { - GST_ERROR ("Failed to create a socket, error : %s", strerror (errno)); + GST_ERROR ("Failed to create a socket, error: %s", g_strerror (errno)); return FALSE; } ret = @@ -92,7 +92,7 @@ cam_sw_client_open (CamSwClient * client, const char *sock_path) sizeof (struct sockaddr_un)); if (ret != 0) { GST_ERROR ("error opening softcam socket %s, error: %s", - sock_path, strerror (errno)); + sock_path, g_strerror (errno)); return FALSE; } @@ -141,7 +141,8 @@ send_ca_pmt (CamSwClient * client, GstMpegTsPMT * pmt, cam_write_length_field (&buffer[3], ca_pmt_size); if (write (client->sock, buffer, buffer_size) == -1) { - GST_WARNING ("write failed when sending pmt with errno: %d", errno); + GST_WARNING ("write failed when sending PMT with error: %s (%d)", + g_strerror (errno), errno); } g_free (ca_pmt);