Changeset aa935693f83221d868cd51522152ef3845222fd4

Timestamp:

17/07/03 16:10:08 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1058451008 +0000

git-parent:

[8c7b5a88af84044ec88e45fdc2bd899ddc524bea]

git-author:

Sam Hocevar <sam@videolan.org> 1058451008 +0000

Message:

• src/stream_output/announce.c:
  + Coding style fixes.
  + Use memcpy() instead of for() loops.
  

Files:

• include/announce.h (modified) (2 diffs)
• src/stream_output/announce.c (modified) (13 diffs)

include/announce.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-6 2003/07/05 15:00:28 zorglub
+7 2003/07/17 14:10:08 sam
- *
- * Authors: Cl�nt Stenac <zorglub@via.ecp.fr>
@@ -52 +52 @@
-        char psz_port[8];
-        module_t p_network;
-
-sendnow
+i_
+i_calls
-        int i_ip_version;
-};

src/stream_output/announce.c

@@ -59 +59 @@
-    unsigned int i_count = 0; /*pos in input string*/
-    unsigned int i_pos1  = 0; /*pos in out2 string */
- 
+
-    char *psz_cur; /*store the pos of the first delim found */
-
+
-    /*skip spaces at the beginning*/
-    while(psz_in[i_count] == ' ' && i_count < strlen(psz_in))
@@ -69 +69 @@
-    if(i_count == strlen(psz_in))
-        return NULL;
-
+
-    /*Look for delim*/
-    while(psz_in[i_count] != delim && i_count < strlen(psz_in))
@@ -79 +79 @@
-    /* Mark the end of out1 */
-    psz_out1[i_pos1] = 0;
-
+
-    if(i_count == strlen(psz_in))
-        return NULL;
-
+
-    /*store pos of the first delim*/
-    psz_cur = &psz_in[i_count];
-
-
-
+
+
+
-    /*skip all delim and all spaces*/
- 
- 
+
+
-           && i_count < strlen(psz_in))
-    {
-        i_count++;
-    }
-
+
-    if(i_count == strlen(psz_in))
-        return psz_cur;
-
+
-    /*Store the second string*/
-    while(i_count < strlen(psz_in))
@@ -107 +107 @@
-    }
-    psz_out2[i_pos2] = 0;
-
+
-    return psz_cur;
-}
@@ -114 +114 @@
- * sout_SAPNew: Creates a SAP Session
- *****************************************************************************/
- 
+
-                char * psz_url_arg,
-                char * psz_name_arg, int ip_version,
@@ -126 +126 @@
-    char                *psz_eol; /* Used to parse IPv6 URIs */
-    int                 i_port; /* Port in numerical format */
-
+
-    /* Allocate the SAP structure */
-
+ 
-    if ( !p_new )
-    {
-No memory left
+out of memory
-        return NULL;
-    }
-
+
-    /* Fill the information in the structure */
- 
+
-    {      /* We have an IPv6 address. Do not use ':' as the port separator */
-        psz_eol = strchr( psz_url_arg, ']' );
-        if( !psz_eol ) /* No matching ] ! Aborting */
-        {
- , "No matching ]. U
-
-
-!psz_eol++
-
- (p_new->psz_url, "%s", psz_url_arg
- (p_new->psz_port, "%s", DEFAULT_PORT
+, "no matching ], u
+
+
+ !psz_eol++ 
+
+( p_new->psz_url, "%s", psz_url_arg 
+( p_new->psz_port, "%s", DEFAULT_PORT 
-        }
-        else
-        {
-            *psz_eol = '\0';
- (p_new->psz_url, "%s", psz_url_arg
+( p_new->psz_url, "%s", psz_url_arg 
-            psz_eol++;
-psz_eol
+ psz_eol 
-            {
-  sprintf (p_new->psz_port, "%s", psz_eol
+sprintf( p_new->psz_port, "%s", psz_eol 
-            }
-    
+
-    }
-    else
-    {
-psz_url_arg,p_new->psz_url,p_new->psz_port,':');   
-
-
+ psz_url_arg, p_new->psz_url, p_new->psz_port, ':' );
+
+
-    /* Check if we have a port */
-p_new->psz_port
-
- (p_new->psz_port, "%s", DEFAULT_PORT
-
-
+ p_new->psz_port 
+
+( p_new->psz_port, "%s", DEFAULT_PORT 
+
+
-    /* Make sure our port is valid and atoi it*/
-    i_port = atoi( p_new->psz_port );
-
+
-    if( !i_port )
-    {
- (p_new->psz_port, "%s", DEFAULT_PORT
+( p_new->psz_port, "%s", DEFAULT_PORT 
-    }
-    else
-    {
-sprintf (p_new->psz_port, "%i", i_port); 
-
-
- 
- ( p_new->psz_name , "%s" 
+ sprintf( p_new->psz_port, "%i", i_port );
+
+
+
+( p_new->psz_name, "%s"
-
-    p_new->i_ip_version = ip_version;
@@ -191 +191 @@
-    if( ip_version != 6 )
-    {
- , "C
+, "c
-
-        /* Fill the socket descriptor */
@@ -203 +203 @@
-        /* Call the network module */
-        sprintf ( psz_network, "ipv4" );
-=
+ = 
-        if( !( p_network = module_Need( p_sout, "network", psz_network ) ) )
-        {
@@ -211 +211 @@
-        module_Unneed( p_sout, p_network );
-
-socket   =      
-p_new->socket <=
-
-U
+i_socket =
+ p_new->i_socket <
+
+u
-            return NULL;
-        }
@@ -220 +220 @@
-    else
-    {
-p_sout , "Creating IPv6 SAP socket with scope %s"
-,
+ p_sout, "creating IPv6 SAP socket with scope %s",
+
-
-        /* Initialize and build the IPv6 address to broadcast to */
-malloc(28*sizeof(char)
+ malloc( 28 * sizeof(char) 
-        if ( !sap_ipv6_addr )
-        {
-
-
-
-
-
-
-
+
+
+
+
+
-
-        /* Fill the socket descriptor */
-
-
-
+  
+  
+  
-        socket_desc.psz_server_addr = sap_ipv6_addr;
-  
-  
+
+
-
-        sprintf ( psz_network, "ipv6" );
-
-        /* Call the network module */
-=(void
+ = (void 
-        if( !( p_network = module_Need( p_sout, "network", psz_network ) ) )
-        {
@@ -254 +252 @@
-        module_Unneed( p_sout, p_network );
-
-
-
-
-
-
+
+
+
+
-            return NULL;
-        }
-
-        /* Free what we allocated */
-
-
-
-
+
+
+
+
+
+
+
-
-    return(p_new);
@@ -274 +274 @@
- * sout_SAPDelete: Deletes a SAP Session
- *****************************************************************************/
- 
+
-{
-
-
- ( p_sout, "Unable to close SAP socket"
-
-
-if( p_this ) 
+i_
+
+( p_sout, "unable to close SAP socket" 
+
+
+
-}
-
@@ -289 +289 @@
-void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this)
-{
-
-
-
-
-
-
+
+
+
+
-    int i_header_size;                      /* SAP header size */
-    int i_msg_size;                         /* SDP content size */
-    int i_size;                             /* Total size */
+    int i_ret = 0;
-
-    /* We send a packet every 24 calls to the function */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
+