diff options
52 files changed, 364 insertions, 255 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index f0822c03c8..d98e3458fd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -214,6 +214,10 @@ src/identity-provider/identity_provider_api.c src/identity-provider/identity_token.c src/identity-provider/plugin_rest_identity_provider.c src/jsonapi/jsonapi.c +src/jsonapi/jsonapi_document.c +src/jsonapi/jsonapi_error.c +src/jsonapi/jsonapi_relationship.c +src/jsonapi/jsonapi_resource.c src/json/json.c src/json/json_generator.c src/json/json_helper.c @@ -322,6 +326,7 @@ src/set/ibf.c src/set/ibf_sim.c src/set/set_api.c src/social/gnunet-service-social.c +src/social/gnunet-social.c src/social/social_api.c src/statistics/gnunet-service-statistics.c src/statistics/gnunet-statistics.c diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c index 5e22d4b47a..87af31f5fe 100644 --- a/src/ats-tests/ats-testing-log.c +++ b/src/ats-tests/ats-testing-log.c @@ -698,12 +698,13 @@ GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l) if (GNUNET_YES == l->verbose) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Master[%u] delta: %llu us, bytes (sent/received): %u / %u; throughput send/recv: %u / %u\n", c_m, - delta.rel_value_us, - mlt->total_bytes_sent, - mlt->total_bytes_received, - mlt->total_throughput_send, - mlt->total_throughput_recv); + "Master[%u] delta: %llu us, bytes (sent/received): %u / %u; throughput send/recv: %u / %u\n", + c_m, + (unsigned long long) delta.rel_value_us, + mlt->total_bytes_sent, + mlt->total_bytes_received, + mlt->total_throughput_send, + mlt->total_throughput_recv); } mlt->slaves_log = GNUNET_malloc (bp->peer->num_partners * @@ -783,13 +784,13 @@ GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l) if (GNUNET_YES == l->verbose) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Master [%u] -> Slave [%u]: delta: %llu us, bytes (sent/received): %u / %u; throughput send/recv: %u / %u\n", - c_m, c_s, - delta.rel_value_us, - mlt->total_bytes_sent, - mlt->total_bytes_received, - slt->throughput_sent, - slt->throughput_recv); + "Master [%u] -> Slave [%u]: delta: %llu us, bytes (sent/received): %u / %u; throughput send/recv: %u / %u\n", + c_m, c_s, + (unsigned long long) delta.rel_value_us, + mlt->total_bytes_sent, + mlt->total_bytes_received, + slt->throughput_sent, + slt->throughput_recv); } else GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, diff --git a/src/ats-tests/ats-testing-preferences.c b/src/ats-tests/ats-testing-preferences.c index 856c8de4b4..256fa844b6 100644 --- a/src/ats-tests/ats-testing-preferences.c +++ b/src/ats-tests/ats-testing-preferences.c @@ -143,13 +143,13 @@ set_pref_task (void *cls) */ struct PreferenceGenerator * GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src, - struct BenchmarkPartner *dest, - enum GeneratorType type, - long int base_value, - long int value_rate, - struct GNUNET_TIME_Relative period, - struct GNUNET_TIME_Relative frequency, - enum GNUNET_ATS_PreferenceKind kind) + struct BenchmarkPartner *dest, + enum GeneratorType type, + unsigned int base_value, + unsigned int value_rate, + struct GNUNET_TIME_Relative period, + struct GNUNET_TIME_Relative frequency, + enum GNUNET_ATS_PreferenceKind kind) { struct PreferenceGenerator *pg; @@ -174,31 +174,31 @@ GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src, switch (type) { case GNUNET_ATS_TEST_TG_CONSTANT: GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Setting up constant preference generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", - dest->me->no, GNUNET_i2s (&dest->me->id), - dest->dest->no, GNUNET_i2s (&dest->dest->id), - base_value); + "Setting up constant preference generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", + dest->me->no, GNUNET_i2s (&dest->me->id), + dest->dest->no, GNUNET_i2s (&dest->dest->id), + base_value); break; case GNUNET_ATS_TEST_TG_LINEAR: GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Setting up linear preference generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", - dest->me->no, GNUNET_i2s (&dest->me->id), - dest->dest->no, GNUNET_i2s (&dest->dest->id), - base_value, value_rate); + "Setting up linear preference generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", + dest->me->no, GNUNET_i2s (&dest->me->id), + dest->dest->no, GNUNET_i2s (&dest->dest->id), + base_value, value_rate); break; case GNUNET_ATS_TEST_TG_SINUS: GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Setting up sinus preference generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", - dest->me->no, GNUNET_i2s (&dest->me->id), - dest->dest->no, GNUNET_i2s (&dest->dest->id), - base_value, value_rate); + "Setting up sinus preference generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", + dest->me->no, GNUNET_i2s (&dest->me->id), + dest->dest->no, GNUNET_i2s (&dest->dest->id), + base_value, value_rate); break; case GNUNET_ATS_TEST_TG_RANDOM: GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Setting up random preference generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", - dest->me->no, GNUNET_i2s (&dest->me->id), - dest->dest->no, GNUNET_i2s (&dest->dest->id), - base_value, value_rate); + "Setting up random preference generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", + dest->me->no, GNUNET_i2s (&dest->me->id), + dest->dest->no, GNUNET_i2s (&dest->dest->id), + base_value, value_rate); break; default: break; diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c index 5eb01bd559..f0bab73672 100644 --- a/src/ats-tests/ats-testing-traffic.c +++ b/src/ats-tests/ats-testing-traffic.c @@ -93,8 +93,9 @@ get_delay (struct TrafficGenerator *tg) delay.rel_value_us = GNUNET_TIME_UNIT_SECONDS.rel_value_us * TEST_MESSAGE_SIZE / cur_rate; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Current rate is %u, calculated delay is %u \n", - cur_rate, delay.rel_value_us); + "Current rate is %lld, calculated delay is %llu\n", + cur_rate, + (unsigned long long) delay.rel_value_us); return delay; } @@ -308,12 +309,12 @@ GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p) */ struct TrafficGenerator * GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, - struct BenchmarkPartner *dest, - enum GeneratorType type, - long int base_rate, - long int max_rate, - struct GNUNET_TIME_Relative period, - struct GNUNET_TIME_Relative duration) + struct BenchmarkPartner *dest, + enum GeneratorType type, + unsigned int base_rate, + unsigned int max_rate, + struct GNUNET_TIME_Relative period, + struct GNUNET_TIME_Relative duration) { struct TrafficGenerator *tg; @@ -337,31 +338,32 @@ GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, switch (type) { case GNUNET_ATS_TEST_TG_CONSTANT: GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Setting up constant traffic generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", - dest->me->no, GNUNET_i2s (&dest->me->id), - dest->dest->no, GNUNET_i2s (&dest->dest->id), - base_rate); + "Setting up constant traffic generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", + dest->me->no, GNUNET_i2s (&dest->me->id), + dest->dest->no, GNUNET_i2s (&dest->dest->id), + base_rate); break; case GNUNET_ATS_TEST_TG_LINEAR: GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Setting up linear traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", - dest->me->no, GNUNET_i2s (&dest->me->id), - dest->dest->no, GNUNET_i2s (&dest->dest->id), - base_rate, max_rate); + "Setting up linear traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", + dest->me->no, GNUNET_i2s (&dest->me->id), + dest->dest->no, GNUNET_i2s (&dest->dest->id), + base_rate, + max_rate); break; case GNUNET_ATS_TEST_TG_SINUS: GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Setting up sinus traffic generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", - dest->me->no, GNUNET_i2s (&dest->me->id), - dest->dest->no, GNUNET_i2s (&dest->dest->id), - base_rate, max_rate); + "Setting up sinus traffic generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", + dest->me->no, GNUNET_i2s (&dest->me->id), + dest->dest->no, GNUNET_i2s (&dest->dest->id), + base_rate, max_rate); break; case GNUNET_ATS_TEST_TG_RANDOM: GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Setting up random traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", - dest->me->no, GNUNET_i2s (&dest->me->id), - dest->dest->no, GNUNET_i2s (&dest->dest->id), - base_rate, max_rate); + "Setting up random traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", + dest->me->no, GNUNET_i2s (&dest->me->id), + dest->dest->no, GNUNET_i2s (&dest->dest->id), + base_rate, max_rate); break; default: break; diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 49aa5a052e..24d4644245 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c @@ -243,8 +243,9 @@ comm_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) if (me->core_slave_connections == top->num_slaves) { - GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Master [%u] connected all slaves\n", - me->no); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + "Master [%u] connected all slaves\n", + me->no); } completed = GNUNET_YES; for (c = 0; c < top->num_masters; c++) @@ -254,9 +255,8 @@ comm_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) } if (GNUNET_YES == completed) { - GNUNET_log(GNUNET_ERROR_TYPE_INFO, - "All master peers connected all slave peers\n", id, - GNUNET_i2s (peer)); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "All master peers connected all slave peers\n"); top->state.connected_CORE = GNUNET_YES; /* Notify about setup done */ if (NULL != top->done_cb) diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h index f0770d6aeb..74da0f78cf 100644 --- a/src/ats-tests/ats-testing.h +++ b/src/ats-tests/ats-testing.h @@ -591,12 +591,13 @@ GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p); */ struct TrafficGenerator * GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, - struct BenchmarkPartner *dest, - enum GeneratorType type, - long int base_rate, - long int max_rate, - struct GNUNET_TIME_Relative period, - struct GNUNET_TIME_Relative duration); + struct BenchmarkPartner *dest, + enum GeneratorType type, + unsigned int base_rate, + unsigned int max_rate, + struct GNUNET_TIME_Relative period, + struct GNUNET_TIME_Relative duration); + void GNUNET_ATS_TEST_generate_traffic_stop (struct TrafficGenerator *tg); @@ -623,13 +624,13 @@ GNUNET_ATS_TEST_generate_traffic_stop_all (); */ struct PreferenceGenerator * GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src, - struct BenchmarkPartner *dest, - enum GeneratorType type, - long int base_value, - long int value_rate, - struct GNUNET_TIME_Relative period, - struct GNUNET_TIME_Relative frequency, - enum GNUNET_ATS_PreferenceKind kind); + struct BenchmarkPartner *dest, + enum GeneratorType type, + unsigned int base_value, + unsigned int value_rate, + struct GNUNET_TIME_Relative period, + struct GNUNET_TIME_Relative frequency, + enum GNUNET_ATS_PreferenceKind kind); void GNUNET_ATS_TEST_generate_preferences_stop (struct PreferenceGenerator *pg); diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c index a753d6a8c2..c2388e28b6 100644 --- a/src/ats/gnunet-service-ats_plugins.c +++ b/src/ats/gnunet-service-ats_plugins.c @@ -132,8 +132,7 @@ solver_info_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_STOP", - (GAS_STAT_SUCCESS == status) ? "SUCCESS" : "FAIL", - add_info); + (GAS_STAT_SUCCESS == status) ? "SUCCESS" : "FAIL"); return; case GAS_OP_SOLVE_SETUP_START: GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -306,7 +305,7 @@ parse_quota (const char *quota_str, direction, GNUNET_ATS_print_network_type (network), quota_str, - GNUNET_ATS_DefaultBandwidth); + (unsigned long long) GNUNET_ATS_DefaultBandwidth); ret = GNUNET_ATS_DefaultBandwidth; } else @@ -360,7 +359,7 @@ load_quota (const struct GNUNET_CONFIGURATION_Handle *cfg, _("No %s-quota configured for network `%s', assigning default bandwidth %llu\n"), direction, GNUNET_ATS_print_network_type (type), - GNUNET_ATS_DefaultBandwidth); + (unsigned long long) GNUNET_ATS_DefaultBandwidth); ret = GNUNET_ATS_DefaultBandwidth; } GNUNET_free (entry); diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index d5b0688e63..960f4788c2 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c @@ -1105,7 +1105,10 @@ process_get_peer (struct GNUNET_CADET_Handle *h, if (msize != esize) { GNUNET_break_op (0); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "m:%u, e: %u\n", msize, esize); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "m:%u, e: %u\n", + (unsigned int) msize, + (unsigned int) esize); h->info_cb.peer_cb (h->info_cls, NULL, 0, 0, 0, NULL); goto clean_cls; } @@ -1212,11 +1215,17 @@ process_get_tunnel (struct GNUNET_CADET_Handle *h, if (msize != esize) { GNUNET_break_op (0); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "m:%u, e: %u (%u ch, %u conn)\n", - msize, esize, ch_n, c_n); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u (%u ch, %u conn)\n", - sizeof (struct GNUNET_CADET_LocalInfoTunnel), - sizeof (CADET_ChannelNumber), sizeof (struct GNUNET_HashCode)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "m:%u, e: %u (%u ch, %u conn)\n", + (unsigned int) msize, + (unsigned int) esize, + ch_n, + c_n); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%u (%u ch, %u conn)\n", + (unsigned int) sizeof (struct GNUNET_CADET_LocalInfoTunnel), + (unsigned int) sizeof (CADET_ChannelNumber), + (unsigned int) sizeof (struct GNUNET_HashCode)); h->info_cb.tunnel_cb (h->info_cls, NULL, 0, 0, NULL, NULL, 0, 0); goto clean_cls; } diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c index b2a07cb0c0..aa095d190f 100644 --- a/src/cadet/gnunet-cadet-profiler.c +++ b/src/cadet/gnunet-cadet-profiler.c @@ -453,8 +453,10 @@ stats_iterator (void *cls, uint32_t i; i = GNUNET_TESTBED_get_index (peer); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " STATS %u - %s [%s]: %llu\n", - i, subsystem, name, value); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " STATS %u - %s [%s]: %llu\n", + i, subsystem, name, + (unsigned long long) value); return GNUNET_OK; } @@ -569,7 +571,9 @@ adjust_running_peers (unsigned int target) static void next_rnd (void *cls) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ROUND %ld\n", current_round); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "ROUND %u\n", + current_round); if (0.0 == rounds[current_round]) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Finishing\n"); @@ -680,7 +684,7 @@ pong (struct GNUNET_CADET_Channel *channel, static size_t tmt_rdy_ping (void *cls, size_t size, void *buf) { - struct CadetPeer *peer = (struct CadetPeer *) cls; + struct CadetPeer *peer = cls; struct CadetPingMessage *msg = buf; peer->ping_ntr = NULL; @@ -691,11 +695,16 @@ tmt_rdy_ping (void *cls, size_t size, void *buf) GNUNET_break (GNUNET_YES == test_finished); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "size %u, buf %p, data_sent %u, data_received %u\n", - size, buf, peer->data_sent, peer->data_received); + (unsigned int) size, + buf, + peer->data_sent, + peer->data_received); return 0; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending: msg %d\n", peer->data_sent); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Sending: msg %d\n", + peer->data_sent); msg->header.size = htons (size); msg->header.type = htons (PING); msg->counter = htonl (peer->data_sent++); @@ -726,7 +735,9 @@ ping_handler (void *cls, struct GNUNET_CADET_Channel *channel, { long n = (long) cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u got PING\n", n); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%u got PING\n", + (unsigned int) n); GNUNET_CADET_receive_done (channel); if (GNUNET_NO == test_finished) pong (channel, (struct CadetPingMessage *) message); @@ -814,8 +825,11 @@ incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel, GNUNET_assert (NULL != peer); if (NULL == peers[n].incoming) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "WARMUP %3u: %u <= %u\n", - peers_warmup, n, get_index (peer)); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "WARMUP %3u: %u <= %u\n", + peers_warmup, + (unsigned int) n, + get_index (peer)); peers_warmup++; if (peers_warmup < peers_total) return NULL; @@ -829,8 +843,11 @@ incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel, } GNUNET_assert (peer == peers[n].incoming); GNUNET_assert (peer->dest == &peers[n]); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u <= %u %p\n", - n, get_index (peer), channel); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "%u <= %u %p\n", + (unsigned int) n, + get_index (peer), + channel); peers[n].incoming_ch = channel; return NULL; @@ -911,8 +928,11 @@ start_test (void *cls) GNUNET_CADET_TEST_cleanup (test_ctx); return; } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u => %u %p\n", - i, get_index (peers[i].dest), peers[i].ch); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "%lu => %u %p\n", + i, + get_index (peers[i].dest), + peers[i].ch); peers[i].ping_task = GNUNET_SCHEDULER_add_delayed (delay_ms_rnd (2000), &ping, &peers[i]); } @@ -981,8 +1001,10 @@ peer_id_cb (void *cls, return; } peers[n].id = *(pinfo->result.id); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, " %u id: %s\n", - n, GNUNET_i2s (&peers[n].id)); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "%ld id: %s\n", + n, + GNUNET_i2s (&peers[n].id)); GNUNET_break (GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (ids, &peers[n].id, &peers[n], GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c index 6453392d85..f24975203e 100644 --- a/src/cadet/gnunet-cadet.c +++ b/src/cadet/gnunet-cadet.c @@ -266,7 +266,9 @@ data_ready (void *cls, size_t size, void *buf) } total_size = data_size + sizeof (struct GNUNET_MessageHeader); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending %u bytes\n", data_size); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "sending %u bytes\n", + (unsigned int) data_size); GNUNET_assert (size >= total_size); msg = buf; @@ -297,7 +299,9 @@ read_stdio (void *cls) static char buf[60000]; data_size = read (0, buf, 60000); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "stdio read %u bytes\n", data_size); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "stdio read %u bytes\n", + (unsigned int) data_size); if (data_size < 1) { GNUNET_SCHEDULER_shutdown(); diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index 7b95891816..77529e3b50 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c @@ -173,15 +173,15 @@ process_header (ogg_packet *op) dec = opus_decoder_create (SAMPLING_RATE, channels, &err); if (OPUS_OK != err) { - fprintf (stderr, - "Cannot create encoder: %s\n", + fprintf (stderr, + "Cannot create encoder: %s\n", opus_strerror (err)); return NULL; } if (! dec) { fprintf (stderr, - "Decoder initialization failed: %s\n", + "Decoder initialization failed: %s\n", opus_strerror (err)); return NULL; } @@ -209,7 +209,7 @@ process_header (ogg_packet *op) #ifdef DEBUG_DUMP_DECODED_OGG -static size_t +static size_t fwrite_le32(opus_int32 i32, FILE *file) { unsigned char buf[4]; @@ -221,7 +221,7 @@ fwrite_le32(opus_int32 i32, FILE *file) } |