Commit 3728bb0f authored by JP Dinger's avatar JP Dinger

Avoid infringing C std namespace the simplistic way.

parent f7ea2a05
...@@ -50,7 +50,7 @@ static const unsigned char xor_table[] = { ...@@ -50,7 +50,7 @@ static const unsigned char xor_table[] = {
#define MAX(x,y) ((x>y) ? x : y) #define MAX(x,y) ((x>y) ? x : y)
/* XXX find a better place for this */ /* XXX find a better place for this */
static inline void *_realloc(void *p, size_t sz) static inline void *realloc_(void *p, size_t sz)
{ {
void *n = realloc(p, sz); void *n = realloc(p, sz);
if( !n ) if( !n )
...@@ -697,27 +697,27 @@ rmff_header_t *real_setup_and_get_header(rtsp_client_t *rtsp_session, int bandw ...@@ -697,27 +697,27 @@ rmff_header_t *real_setup_and_get_header(rtsp_client_t *rtsp_session, int bandw
/* setup our streams */ /* setup our streams */
real_calc_response_and_checksum (challenge2, checksum, challenge1); real_calc_response_and_checksum (challenge2, checksum, challenge1);
buf = _realloc(buf, strlen(challenge2) + strlen(checksum) + 32); buf = realloc_(buf, strlen(challenge2) + strlen(checksum) + 32);
if( !buf ) goto error; if( !buf ) goto error;
sprintf(buf, "RealChallenge2: %s, sd=%s", challenge2, checksum); sprintf(buf, "RealChallenge2: %s, sd=%s", challenge2, checksum);
rtsp_schedule_field(rtsp_session, buf); rtsp_schedule_field(rtsp_session, buf);
buf = _realloc(buf, strlen(session_id) + 32); buf = realloc_(buf, strlen(session_id) + 32);
if( !buf ) goto error; if( !buf ) goto error;
sprintf(buf, "If-Match: %s", session_id); sprintf(buf, "If-Match: %s", session_id);
rtsp_schedule_field(rtsp_session, buf); rtsp_schedule_field(rtsp_session, buf);
rtsp_schedule_field(rtsp_session, "Transport: x-pn-tng/tcp;mode=play,rtp/avp/tcp;unicast;mode=play"); rtsp_schedule_field(rtsp_session, "Transport: x-pn-tng/tcp;mode=play,rtp/avp/tcp;unicast;mode=play");
buf = _realloc(buf, strlen(mrl) + 32); buf = realloc_(buf, strlen(mrl) + 32);
if( !buf ) goto error; if( !buf ) goto error;
sprintf(buf, "%s/streamid=0", mrl); sprintf(buf, "%s/streamid=0", mrl);
rtsp_request_setup(rtsp_session,buf); rtsp_request_setup(rtsp_session,buf);
if (h->prop->num_streams > 1) { if (h->prop->num_streams > 1) {
rtsp_schedule_field(rtsp_session, "Transport: x-pn-tng/tcp;mode=play,rtp/avp/tcp;unicast;mode=play"); rtsp_schedule_field(rtsp_session, "Transport: x-pn-tng/tcp;mode=play,rtp/avp/tcp;unicast;mode=play");
buf = _realloc(buf, strlen(session_id) + 32); buf = realloc_(buf, strlen(session_id) + 32);
if( !buf ) goto error; if( !buf ) goto error;
sprintf(buf, "If-Match: %s", session_id); sprintf(buf, "If-Match: %s", session_id);
rtsp_schedule_field(rtsp_session, buf); rtsp_schedule_field(rtsp_session, buf);
buf = _realloc(buf, strlen(mrl) + 32); buf = realloc_(buf, strlen(mrl) + 32);
if( !buf ) goto error; if( !buf ) goto error;
sprintf(buf, "%s/streamid=1", mrl); sprintf(buf, "%s/streamid=1", mrl);
rtsp_request_setup(rtsp_session,buf); rtsp_request_setup(rtsp_session,buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment