Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf

@@ -97,7 +97,7 @@ Channel.signal=1C
 ;######### ACQUISITION GLOBAL CONFIG ############
 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler
 Acquisition_1C.item_type=gr_complex
-Acquisition_1C.coherent_integration_time_ms	=1
+Acquisition_1C.coherent_integration_time_ms=1
 Acquisition_1C.threshold=0.015
 ;Acquisition_1C.pfa=0.0001
 Acquisition_1C.doppler_max=10000

src/core/libs/supl/asn-rrlp/ENUMERATED.c

@@ -50,7 +50,7 @@ ENUMERATED_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td
     }
 
     rval = NativeEnumerated_decode_uper(opt_codec_ctx, td, constraints,
-			(void **)&vptr, pd);
+            &vptr, pd);
     if(rval.code == RC_OK)
         if(asn_long2INTEGER(st, value))
             rval.code = RC_FAIL;

src/core/libs/supl/asn-rrlp/NativeInteger.c

@@ -121,7 +121,7 @@ NativeInteger_decode_ber(asn_codec_ctx_t *opt_codec_ctx,
     rval.consumed += length;
 
     ASN_DEBUG("Took %ld/%ld bytes to encode %s (%ld)",
-		(long)rval.consumed, (long)length, td->name, (long)*native);
+        (long)rval.consumed, (long)length, td->name, *native);
 
     return rval;
 }

src/core/libs/supl/asn-rrlp/OCTET_STRING.c

@@ -251,9 +251,9 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx,
 
 
         ASN_DEBUG("%p, s->l=%ld, s->wn=%ld, s->g=%ld\n", sel,
-			(long)(sel?sel->left:0),
+            (sel?sel->left:0),
             (long)(sel?sel->want_nulls:0),
-			(long)(sel?sel->got:0)
+            (sel?sel->got:0)
         );
         if(sel && sel->left <= 0 && sel->want_nulls == 0) {
             if(sel->prev) {
@@ -277,7 +277,7 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx,
         tl = ber_fetch_tag(buf_ptr, Left, &tlv_tag);
         ASN_DEBUG("fetch tag(size=%ld,L=%ld), %sstack, left=%ld, wn=%ld, tl=%ld",
             (long)size, (long)Left, sel?"":"!",
-			(long)(sel?sel->left:0),
+            (sel?sel->left:0),
             (long)(sel?sel->want_nulls:0),
             (long)tl);
         switch(tl) {
@@ -1276,7 +1276,7 @@ OCTET_STRING_per_put_characters(asn_per_outp_t *po, const uint8_t *buf,
             int code;
             uint32_t value;
             switch(bpc) {
-			case 1: value = *(const uint8_t *)buf; break;
+            case 1: value = *buf; break;
             case 2: value = (buf[0] << 8) | buf[1]; break;
             case 4: value = (buf[0] << 24) | (buf[1] << 16)
                     | (buf[2] << 8) | buf[3]; break;
@@ -1303,7 +1303,7 @@ OCTET_STRING_per_put_characters(asn_per_outp_t *po, const uint8_t *buf,
         int ch;
         uint32_t value;
         switch(bpc) {
-		case 1: value = *(const uint8_t *)buf; break;
+        case 1: value = *buf; break;
         case 2: value = (buf[0] << 8) | buf[1]; break;
         case 4: value = (buf[0] << 24) | (buf[1] << 16)
                 | (buf[2] << 8) | buf[3]; break;

src/core/libs/supl/asn-rrlp/ber_decoder.c

@@ -131,7 +131,7 @@ ber_check_tags(asn_codec_ctx_t *opt_codec_ctx,
         case 0: RETURN(RC_WMORE);
         }
         ASN_DEBUG("Advancing %ld in ANY case",
-			(long)(tag_len + len_len));
+            (tag_len + len_len));
         ADVANCE(tag_len + len_len);
     } else {
         assert(tagno < td->tags_count);    /* At least one loop */

src/core/libs/supl/asn-rrlp/ber_tlv_length.c

@@ -15,7 +15,7 @@ ber_fetch_length(int _is_constructed, const void *bufptr, size_t size,
     if(size == 0)
         return 0;    /* Want more */
 
-	oct = *(const uint8_t *)buf;
+    oct = *buf;
     if((oct & 0x80) == 0) {
         /*
          * Short definite length.

src/core/libs/supl/asn-rrlp/converter-sample.c

@@ -629,20 +629,20 @@ data_decode_from_file(asn_TYPE_descriptor_t *pduType, FILE *file, const char *na
         switch(iform) {
         case INP_BER:
             rval = ber_decode(opt_codec_ctx, pduType,
-				(void **)&structure, i_bptr, i_size);
+                &structure, i_bptr, i_size);
             break;
         case INP_XER:
             rval = xer_decode(opt_codec_ctx, pduType,
-				(void **)&structure, i_bptr, i_size);
+                &structure, i_bptr, i_size);
             break;
         case INP_PER:
             if(opt_nopad)
             rval = uper_decode(opt_codec_ctx, pduType,
-				(void **)&structure, i_bptr, i_size, 0,
+                &structure, i_bptr, i_size, 0,
                 DynamicBuffer.unbits);
             else
             rval = uper_decode_complete(opt_codec_ctx, pduType,
-				(void **)&structure, i_bptr, i_size);
+                &structure, i_bptr, i_size);
             switch(rval.code) {
             case RC_OK:
                 /* Fall through */

src/core/libs/supl/asn-rrlp/per_support.c

@@ -51,7 +51,7 @@ per_get_few_bits(asn_per_data_t *pd, int nbits) {
                 if(!pd->refill || nbits > 31) return -1;
                 /* Accumulate unused bytes before refill */
                 ASN_DEBUG("Obtain the rest %d bits (want %d)",
-                        (int)nleft, (int)nbits);
+                        (int)nleft, nbits);
                 tailv = per_get_few_bits(pd, nleft);
                 if(tailv < 0) return -1;
                 /* Refill (replace pd contents with new data) */
@@ -107,7 +107,7 @@ per_get_few_bits(asn_per_data_t *pd, int nbits) {
         accum &= (((uint32_t)1 << nbits) - 1);
 
         ASN_DEBUG("  [PER got %2d<=%2d bits => span %d %+ld[%d..%d]:%02x (%d) => 0x%x]",
-                (int)nbits, (int)nleft,
+                nbits, (int)nleft,
                 (int)pd->moved,
                 (((long)pd->buffer) & 0xf),
                 (int)pd->nboff, (int)pd->nbits,
@@ -434,7 +434,7 @@ per_put_few_bits(asn_per_outp_t *po, uint32_t bits, int obits) {
 
         ASN_DEBUG("[PER out %u/%x => %02x buf+%ld]",
                 (int)bits, (int)bits, buf[0],
-                (long)(po->buffer - po->tmpspace));
+                (po->buffer - po->tmpspace));
 
         return 0;
 }

src/core/libs/supl/asn-supl/AltitudeInfo.c

@@ -275,4 +275,3 @@ asn_TYPE_descriptor_t asn_DEF_AltitudeInfo = {
     3,    /* Elements count */
     &asn_SPC_AltitudeInfo_specs_1    /* Additional specs */
 };
-

src/core/libs/supl/asn-supl/BIT_STRING.c

@@ -186,4 +186,3 @@ BIT_STRING_print(asn_TYPE_descriptor_t *td, const void *sptr, int ilevel,
 
     return 0;
 }
-

src/core/libs/supl/asn-supl/CPICH-Ec-N0.c

@@ -142,4 +142,3 @@ asn_TYPE_descriptor_t asn_DEF_CPICH_Ec_N0 = {
     0, 0,    /* No members */
     0    /* No specifics */
 };
-

src/core/libs/supl/asn-supl/CPICH-RSCP.c

@@ -142,4 +142,3 @@ asn_TYPE_descriptor_t asn_DEF_CPICH_RSCP = {
     0, 0,    /* No members */
     0    /* No specifics */
 };
-

src/core/libs/supl/asn-supl/CdmaCellInformation.c

@@ -366,4 +366,3 @@ asn_TYPE_descriptor_t asn_DEF_CdmaCellInformation = {
     8,    /* Elements count */
     &asn_SPC_CdmaCellInformation_specs_1    /* Additional specs */
 };
-

src/core/libs/supl/asn-supl/CellInfo.c

@@ -77,4 +77,3 @@ asn_TYPE_descriptor_t asn_DEF_CellInfo = {
     3,    /* Elements count */
     &asn_SPC_CellInfo_specs_1    /* Additional specs */
 };
-

src/core/libs/supl/asn-supl/CellMeasuredResults.c

@@ -341,4 +341,3 @@ asn_TYPE_descriptor_t asn_DEF_CellMeasuredResults = {
     2,    /* Elements count */
     &asn_SPC_CellMeasuredResults_specs_1    /* Additional specs */
 };
-

src/core/libs/supl/asn-supl/CellMeasuredResultsList.c

@@ -54,4 +54,3 @@ asn_TYPE_descriptor_t asn_DEF_CellMeasuredResultsList = {
     1,    /* Single element */
     &asn_SPC_CellMeasuredResultsList_specs_1    /* Additional specs */
 };
-

src/core/libs/supl/asn-supl/CellParametersID.c

@@ -142,4 +142,3 @@ asn_TYPE_descriptor_t asn_DEF_CellParametersID = {
     0, 0,    /* No members */
     0    /* No specifics */
 };
-

src/core/libs/supl/asn-supl/DUMMY.c

@@ -120,4 +120,3 @@ asn_TYPE_descriptor_t asn_DEF_DUMMY = {
     0, 0,    /* No members */
     0    /* No specifics */
 };
-

src/core/libs/supl/asn-supl/ENUMERATED.c

@@ -50,7 +50,7 @@ ENUMERATED_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td
     }
 
     rval = NativeEnumerated_decode_uper(opt_codec_ctx, td, constraints,
-			(void **)&vptr, pd);
+            &vptr, pd);
     if(rval.code == RC_OK)
         if(asn_long2INTEGER(st, value))
             rval.code = RC_FAIL;
@@ -68,4 +68,3 @@ ENUMERATED_encode_uper(asn_TYPE_descriptor_t *td,
 
     return NativeEnumerated_encode_uper(td, constraints, &value, po);
 }
-

src/core/libs/supl/asn-supl/EncodingType.c

@@ -146,4 +146,3 @@ asn_TYPE_descriptor_t asn_DEF_EncodingType = {
     0, 0,    /* Defined elsewhere */
     &asn_SPC_EncodingType_specs_1    /* Additional specs */
 };
-

src/core/libs/supl/asn-supl/FormatIndicator.c

@@ -156,4 +156,3 @@ asn_TYPE_descriptor_t asn_DEF_FormatIndicator = {
     0, 0,    /* Defined elsewhere */
     &asn_SPC_FormatIndicator_specs_1    /* Additional specs */
 };
-

src/core/libs/supl/asn-supl/IA5String.c

@@ -59,7 +59,7 @@ IA5String_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
                     "%s: value byte %ld out of range: "
                     "%d > 127 (%s:%d)",
                     td->name,
-					(long)((buf - st->buf) + 1),
+                    ((buf - st->buf) + 1),
                     *buf,
                     __FILE__, __LINE__);
                 return -1;

src/core/libs/supl/asn-supl/OCTET_STRING.c

@@ -251,9 +251,9 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx,
 
 
         ASN_DEBUG("%p, s->l=%ld, s->wn=%ld, s->g=%ld\n", sel,
-			(long)(sel?sel->left:0),
+            (sel?sel->left:0),
             (long)(sel?sel->want_nulls:0),
-			(long)(sel?sel->got:0)
+            (sel?sel->got:0)
         );
         if(sel && sel->left <= 0 && sel->want_nulls == 0) {
             if(sel->prev) {
@@ -277,7 +277,7 @@ OCTET_STRING_decode_ber(asn_codec_ctx_t *opt_codec_ctx,
         tl = ber_fetch_tag(buf_ptr, Left, &tlv_tag);
         ASN_DEBUG("fetch tag(size=%ld,L=%ld), %sstack, left=%ld, wn=%ld, tl=%ld",
             (long)size, (long)Left, sel?"":"!",
-			(long)(sel?sel->left:0),
+            (sel?sel->left:0),
             (long)(sel?sel->want_nulls:0),
             (long)tl);
         switch(tl) {
@@ -1276,7 +1276,7 @@ OCTET_STRING_per_put_characters(asn_per_outp_t *po, const uint8_t *buf,
             int code;
             uint32_t value;
             switch(bpc) {
-			case 1: value = *(const uint8_t *)buf; break;
+            case 1: value = *buf; break;
             case 2: value = (buf[0] << 8) | buf[1]; break;
             case 4: value = (buf[0] << 24) | (buf[1] << 16)
                     | (buf[2] << 8) | buf[3]; break;
@@ -1303,7 +1303,7 @@ OCTET_STRING_per_put_characters(asn_per_outp_t *po, const uint8_t *buf,
         int ch;
         uint32_t value;
         switch(bpc) {
-		case 1: value = *(const uint8_t *)buf; break;
+        case 1: value = *buf; break;
         case 2: value = (buf[0] << 8) | buf[1]; break;
         case 4: value = (buf[0] << 24) | (buf[1] << 16)
                 | (buf[2] << 8) | buf[3]; break;

src/core/libs/supl/asn-supl/VisibleString.c

@@ -62,7 +62,7 @@ VisibleString_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
                     "%s: value byte %ld (%d) "
                     "not in VisibleString alphabet (%s:%d)",
                     td->name,
-					(long)((buf - st->buf) + 1),
+                    ((buf - st->buf) + 1),
                     *buf,
                     __FILE__, __LINE__);
                 return -1;

src/core/libs/supl/asn-supl/asn_SEQUENCE_OF.c

@@ -38,4 +38,3 @@ asn_sequence_del(void *asn_sequence_of_x, int number, int _do_free) {
         if(ptr) as->free(ptr);
     }
 }
-

src/core/libs/supl/asn-supl/asn_SET_OF.c

@@ -85,4 +85,3 @@ asn_set_empty(void *asn_set_of_x) {
     }
 
 }
-

src/core/libs/supl/asn-supl/asn_codecs_prim.c

@@ -292,4 +292,3 @@ xer_decode_primitive(asn_codec_ctx_t *opt_codec_ctx,
     }
     return rc;
 }
-

src/core/libs/supl/asn-supl/ber_decoder.c

@@ -131,7 +131,7 @@ ber_check_tags(asn_codec_ctx_t *opt_codec_ctx,
         case 0: RETURN(RC_WMORE);
         }
         ASN_DEBUG("Advancing %ld in ANY case",
-			(long)(tag_len + len_len));
+            (tag_len + len_len));
         ADVANCE(tag_len + len_len);
     } else {
         assert(tagno < td->tags_count);    /* At least one loop */

src/core/libs/supl/asn-supl/ber_tlv_length.c

@@ -15,7 +15,7 @@ ber_fetch_length(int _is_constructed, const void *bufptr, size_t size,
     if(size == 0)
         return 0;    /* Want more */
 
-	oct = *(const uint8_t *)buf;
+    oct = *buf;
     if((oct & 0x80) == 0) {
         /*
          * Short definite length.
@@ -175,4 +175,3 @@ der_tlv_length_serialize(ber_tlv_len_t len, void *bufp, size_t size) {
 
     return required_size + 1;
 }
-

src/core/libs/supl/asn-supl/constr_SEQUENCE_OF.c

@@ -205,4 +205,3 @@ SEQUENCE_OF_encode_uper(asn_TYPE_descriptor_t *td,
 
     _ASN_ENCODED_OK(er);
 }
-

src/core/libs/supl/asn-supl/constraints.c

@@ -88,4 +88,3 @@ asn_check_constraints(asn_TYPE_descriptor_t *type_descriptor,
 
     return ret;
 }
-

src/core/libs/supl/asn-supl/per_support.c

@@ -51,7 +51,7 @@ per_get_few_bits(asn_per_data_t *pd, int nbits) {
                 if(!pd->refill || nbits > 31) return -1;
                 /* Accumulate unused bytes before refill */
                 ASN_DEBUG("Obtain the rest %d bits (want %d)",
-                        (int)nleft, (int)nbits);
+                        (int)nleft, nbits);
                 tailv = per_get_few_bits(pd, nleft);
                 if(tailv < 0) return -1;
                 /* Refill (replace pd contents with new data) */
@@ -107,7 +107,7 @@ per_get_few_bits(asn_per_data_t *pd, int nbits) {
         accum &= (((uint32_t)1 << nbits) - 1);
 
         ASN_DEBUG("  [PER got %2d<=%2d bits => span %d %+ld[%d..%d]:%02x (%d) => 0x%x]",
-                (int)nbits, (int)nleft,
+                nbits, (int)nleft,
                 (int)pd->moved,
                 (((long)pd->buffer) & 0xf),
                 (int)pd->nboff, (int)pd->nbits,
@@ -434,7 +434,7 @@ per_put_few_bits(asn_per_outp_t *po, uint32_t bits, int obits) {
 
         ASN_DEBUG("[PER out %u/%x => %02x buf+%ld]",
                 (int)bits, (int)bits, buf[0],
-                (long)(po->buffer - po->tmpspace));
+                (po->buffer - po->tmpspace));
 
         return 0;
 }

src/core/libs/supl/supl.c

@@ -77,7 +77,7 @@ int EXPORT supl_ulp_encode(supl_ulp_t *pdu)
             memset(pdu->buffer, 0, sizeof(pdu->buffer));
 
             pdu_len = (ret.encoded + 7) >> 3;
-            ((ULP_PDU_t *)pdu->pdu)->length = pdu_len;
+            (pdu->pdu)->length = pdu_len;
 
             ret = uper_encode_to_buffer(&asn_DEF_ULP_PDU, pdu->pdu, pdu->buffer, sizeof(pdu->buffer));
             if (ret.encoded > 0)
@@ -250,7 +250,7 @@ int EXPORT supl_server_connect(supl_ctx_t *ctx, char *server)
 
     SSLeay_add_ssl_algorithms();
     // meth = TLSv1_client_method();
-    meth = (SSL_METHOD *)SSLv23_client_method();
+    meth = SSLv23_client_method();
     SSL_load_error_strings();
     ctx->ssl_ctx = SSL_CTX_new(meth);
     if (!ctx->ssl_ctx)