Skip to content

Commit 0d1ffd1

Browse files
feuerstefeuerste
authored
all: fix various warnings (#777)
1 parent 9756369 commit 0d1ffd1

5 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎src/arvcamera.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,7 +1872,7 @@ arv_camera_get_gain_auto (ArvCamera *camera, GError **error)
18721872
/**
18731873
* arv_camera_select_gain:
18741874
* @camera: a #ArvCamera
1875-
* @gainSelector: gain selector
1875+
* @selector: gain selector
18761876
* @error: a #GError placeholder, %NULL to ignore
18771877
*
18781878
* Configures Gain Selector feature.
@@ -1881,9 +1881,9 @@ arv_camera_get_gain_auto (ArvCamera *camera, GError **error)
18811881
**/
18821882

18831883
void
1884-
arv_camera_select_gain (ArvCamera *camera, const char *gainSelector, GError **error)
1884+
arv_camera_select_gain (ArvCamera *camera, const char *selector, GError **error)
18851885
{
1886-
arv_camera_set_string (camera, "GainSelector", gainSelector, error);
1886+
arv_camera_set_string (camera, "GainSelector", selector, error);
18871887
}
18881888

18891889
/**
@@ -1986,7 +1986,7 @@ arv_camera_get_black_level (ArvCamera *camera, GError **error)
19861986
/**
19871987
* arv_camera_select_black_level:
19881988
* @camera: a #ArvCamera
1989-
* @blackLevelSelector: black level selection
1989+
* @selector: black level selection
19901990
* @error: a #GError placeholder, %NULL to ignore
19911991
*
19921992
* Configures Black Level Selector feature.
@@ -1995,9 +1995,9 @@ arv_camera_get_black_level (ArvCamera *camera, GError **error)
19951995
**/
19961996

19971997
void
1998-
arv_camera_select_black_level (ArvCamera *camera, const char *blackLevelSelector, GError **error)
1998+
arv_camera_select_black_level (ArvCamera *camera, const char *selector, GError **error)
19991999
{
2000-
arv_camera_set_string (camera, "BlackLevelSelector", blackLevelSelector, error);
2000+
arv_camera_set_string (camera, "BlackLevelSelector", selector, error);
20012001
}
20022002

20032003
/**

‎src/arvcamera.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ ARV_API void arv_camera_set_exposure_mode (ArvCamera *camera, ArvExposureMode
141141

142142
ARV_API gboolean arv_camera_is_gain_available (ArvCamera *camera, GError **error);
143143
ARV_API gboolean arv_camera_is_gain_auto_available (ArvCamera *camera, GError **error);
144-
ARV_API void arv_camera_select_gain (ArvCamera *camera, const char *selector, GError **error);
145-
ARV_API const char ** arv_camera_dup_available_gains (ArvCamera *camera, guint *n_selectors, GError **error);
144+
ARV_API void arv_camera_select_gain (ArvCamera *camera, const char *selector, GError **error);
145+
ARV_API const char ** arv_camera_dup_available_gains (ArvCamera *camera, guint *n_selectors, GError **error);
146146

147147
ARV_API void arv_camera_set_gain (ArvCamera *camera, double gain, GError **error);
148148
ARV_API double arv_camera_get_gain (ArvCamera *camera, GError **error);
@@ -153,7 +153,7 @@ ARV_API ArvAuto arv_camera_get_gain_auto (ArvCamera *camera, GError **error);
153153
ARV_API gboolean arv_camera_is_black_level_available (ArvCamera *camera, GError **error);
154154
ARV_API gboolean arv_camera_is_black_level_auto_available(ArvCamera *camera, GError **error);
155155
ARV_API void arv_camera_select_black_level (ArvCamera *camera, const char *selector, GError **error);
156-
ARV_API const char ** arv_camera_dup_available_black_level(ArvCamera *camera, guint *n_selectors, GError **error);
156+
ARV_API const char ** arv_camera_dup_available_black_levels (ArvCamera *camera, guint *n_selectors, GError **error);
157157

158158
ARV_API void arv_camera_set_black_level (ArvCamera *camera, double blacklevel, GError **error);
159159
ARV_API double arv_camera_get_black_level (ArvCamera *camera, GError **error);

‎src/arvgvspprivate.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,12 @@ static inline ArvGvspContentType
270270
arv_gvsp_packet_get_content_type (const ArvGvspPacket *packet)
271271
{
272272
if (arv_gvsp_packet_has_extended_ids (packet)) {
273-
ArvGvspExtendedHeader *header = (void *) &packet->header;
273+
ArvGvspExtendedHeader *header = (ArvGvspExtendedHeader *) &packet->header;
274274

275275
return (ArvGvspContentType) ((g_ntohl (header->packet_infos) & ARV_GVSP_PACKET_INFOS_CONTENT_TYPE_MASK) >>
276276
ARV_GVSP_PACKET_INFOS_CONTENT_TYPE_POS);
277277
} else {
278-
ArvGvspHeader *header = (void *) &packet->header;
278+
ArvGvspHeader *header = (ArvGvspHeader *) &packet->header;
279279

280280
return (ArvGvspContentType) ((g_ntohl (header->packet_infos) & ARV_GVSP_PACKET_INFOS_CONTENT_TYPE_MASK) >>
281281
ARV_GVSP_PACKET_INFOS_CONTENT_TYPE_POS);
@@ -327,11 +327,11 @@ static inline guint32
327327
arv_gvsp_packet_get_packet_id (const ArvGvspPacket *packet)
328328
{
329329
if (arv_gvsp_packet_has_extended_ids (packet)) {
330-
ArvGvspExtendedHeader *header = (void *) &packet->header;
330+
ArvGvspExtendedHeader *header = (ArvGvspExtendedHeader *) &packet->header;
331331

332332
return g_ntohl (header->packet_id);
333333
} else {
334-
ArvGvspHeader *header = (void *) &packet->header;
334+
ArvGvspHeader *header = (ArvGvspHeader *) &packet->header;
335335

336336
return g_ntohl (header->packet_infos) & ARV_GVSP_PACKET_ID_MASK;
337337
}
@@ -341,11 +341,11 @@ static inline guint64
341341
arv_gvsp_packet_get_frame_id (const ArvGvspPacket *packet)
342342
{
343343
if (arv_gvsp_packet_has_extended_ids (packet)) {
344-
ArvGvspExtendedHeader *header = (void *) &packet->header;
344+
ArvGvspExtendedHeader *header = (ArvGvspExtendedHeader *) &packet->header;
345345

346346
return GUINT64_FROM_BE(header->frame_id);
347347
} else {
348-
ArvGvspHeader *header = (void *) &packet->header;
348+
ArvGvspHeader *header = (ArvGvspHeader *) &packet->header;
349349

350350
return g_ntohs (header->frame_id);
351351
}
@@ -355,11 +355,11 @@ static inline void *
355355
arv_gvsp_packet_get_data (const ArvGvspPacket *packet)
356356
{
357357
if (arv_gvsp_packet_has_extended_ids (packet)) {
358-
ArvGvspExtendedHeader *header = (void *) &packet->header;
358+
ArvGvspExtendedHeader *header = (ArvGvspExtendedHeader *) &packet->header;
359359

360360
return &header->data;
361361
} else {
362-
ArvGvspHeader *header = (void *) &packet->header;
362+
ArvGvspHeader *header = (ArvGvspHeader *) &packet->header;
363363

364364
return &header->data;
365365
}
@@ -372,14 +372,14 @@ arv_gvsp_leader_packet_get_buffer_payload_type (const ArvGvspPacket *packet, gbo
372372
ArvGvspLeader *leader;
373373
guint16 payload_type;
374374

375-
leader = arv_gvsp_packet_get_data (packet);
375+
leader = (ArvGvspLeader *) arv_gvsp_packet_get_data (packet);
376376
payload_type = g_ntohs (leader->payload_type);
377377

378378
if (has_chunks != NULL)
379379
*has_chunks = ((payload_type & 0x4000) != 0 ||
380380
(payload_type == 0x0004));
381381

382-
return payload_type & 0x3fff;
382+
return (ArvBufferPayloadType) (payload_type & 0x3fff);
383383
}
384384

385385
return ARV_BUFFER_PAYLOAD_TYPE_UNKNOWN;
@@ -391,7 +391,7 @@ arv_gvsp_leader_packet_get_timestamp (const ArvGvspPacket *packet)
391391
if (G_LIKELY (arv_gvsp_packet_get_content_type (packet) == ARV_GVSP_CONTENT_TYPE_LEADER)) {
392392
ArvGvspLeader *leader;
393393

394-
leader = arv_gvsp_packet_get_data (packet);
394+
leader = (ArvGvspLeader *) arv_gvsp_packet_get_data (packet);
395395

396396
return ((guint64) g_ntohl (leader->timestamp_high) << 32) | g_ntohl (leader->timestamp_low);
397397
}
@@ -404,10 +404,10 @@ arv_gvsp_leader_packet_get_multipart_n_parts (const ArvGvspPacket *packet)
404404
{
405405
if (arv_gvsp_leader_packet_get_buffer_payload_type (packet, NULL) == ARV_BUFFER_PAYLOAD_TYPE_MULTIPART) {
406406
if (arv_gvsp_packet_has_extended_ids (packet)) {
407-
ArvGvspExtendedHeader *header = (void *) &packet->header;
407+
ArvGvspExtendedHeader *header = (ArvGvspExtendedHeader *) &packet->header;
408408
return (g_ntohl (header->packet_infos) & ARV_GVSP_PACKET_INFOS_N_PARTS_MASK);
409409
} else {
410-
ArvGvspHeader *header = (void *) &packet->header;
410+
ArvGvspHeader *header = (ArvGvspHeader *) &packet->header;
411411
return (g_ntohl (header->packet_infos) & ARV_GVSP_PACKET_INFOS_N_PARTS_MASK);
412412
}
413413
}
@@ -437,11 +437,11 @@ arv_gvsp_leader_packet_get_multipart_infos (const ArvGvspPacket *packet,
437437
if (part_id >= n_parts)
438438
return FALSE;
439439

440-
leader = arv_gvsp_packet_get_data (packet);
440+
leader = (ArvGvspMultipartLeader *) arv_gvsp_packet_get_data (packet);
441441
infos = &leader->parts[part_id];
442442

443443
*purpose_id = g_ntohs(infos->data_purpose_id);
444-
*data_type = g_ntohs (infos->data_type);
444+
*data_type = (ArvBufferPartDataType) g_ntohs (infos->data_type);
445445
*size = g_ntohl (infos->part_length_low) + (((guint64) g_ntohs (infos->part_length_high)) << 32);
446446
*pixel_format = g_ntohl (infos->pixel_format);
447447
*width = g_ntohl (infos->width);
@@ -466,7 +466,7 @@ arv_gvsp_leader_packet_get_multipart_size (const ArvGvspPacket *packet,
466466
if (part_id >= n_parts)
467467
return 0;
468468

469-
leader = arv_gvsp_packet_get_data (packet);
469+
leader = (ArvGvspMultipartLeader *) arv_gvsp_packet_get_data (packet);
470470
infos = &leader->parts[part_id];
471471

472472
return g_ntohl (infos->part_length_low) + (((guint64) g_ntohs (infos->part_length_high)) << 32);
@@ -487,7 +487,7 @@ arv_gvsp_leader_packet_get_image_infos (const ArvGvspPacket *packet,
487487
payload_type == ARV_BUFFER_PAYLOAD_TYPE_EXTENDED_CHUNK_DATA) {
488488
ArvGvspImageLeader *leader;
489489

490-
leader = arv_gvsp_packet_get_data (packet);
490+
leader = (ArvGvspImageLeader *) arv_gvsp_packet_get_data (packet);
491491

492492
*pixel_format = g_ntohl (leader->infos.pixel_format);
493493
*width = g_ntohl (leader->infos.width);
@@ -526,7 +526,7 @@ arv_gvsp_multipart_packet_get_infos (const ArvGvspPacket *packet, guint *part_id
526526
return FALSE;
527527
}
528528

529-
multipart = arv_gvsp_packet_get_data(packet);
529+
multipart = (ArvGvspMultipart *) arv_gvsp_packet_get_data(packet);
530530

531531
*part_id = multipart->part_id;
532532
*offset = ( (guint64) g_ntohs(multipart->offset_high) << 32) + g_ntohl(multipart->offset_low);

‎src/arvuvcpprivate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ static inline ArvUvcpFlags
314314
arv_uvcp_packet_get_flags (const ArvUvcpPacket *packet)
315315
{
316316
if (packet == NULL)
317-
return 0;
317+
return (ArvUvcpFlags) 0;
318318

319319
return (ArvUvcpFlags) GUINT16_FROM_LE (packet->header.flags);
320320
}

‎src/arvuvspprivate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ arv_uvsp_packet_get_buffer_payload_type (ArvUvspPacket *packet, gboolean *has_ch
123123
if (has_chunks != NULL)
124124
*has_chunks = (payload_type & 0x4000) != 0;
125125

126-
return payload_type & 0x3fff;
126+
return (ArvBufferPayloadType) (payload_type & 0x3fff);
127127
}
128128

129129
static inline guint64

0 commit comments

Comments
 (0)