Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc_md5.h

diff --git a/include/vlc_md5.h b/include/vlc_md5.h
index c4a79ca6ddb3827982039e7a5095d414de660bf9..d05126980ffacc7e6778cdc35a74339374386292 100644 (file)
--- a/include/vlc_md5.h
+++ b/include/vlc_md5.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_md5.h: MD5 hash
  *****************************************************************************
- * Copyright (C) 2004-2005 VideoLAN
+ * Copyright (C) 2004-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -19,11 +19,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_MD5_H
-# define _VLC_MD5_H
+#ifndef VLC_MD5_H
+# define VLC_MD5_H
+
+/**
+ * \file
+ * This file defines functions and structures for handling md5 checksums
+ */
 
 /*****************************************************************************
  * md5_s: MD5 message structure
@@ -39,8 +44,31 @@ struct md5_s
 };
 
 VLC_EXPORT(void, InitMD5, ( struct md5_s * ) );
-VLC_EXPORT(void, AddMD5, ( struct md5_s *, const uint8_t *, uint32_t ) );
+VLC_EXPORT(void, AddMD5, ( struct md5_s *, const void *, size_t ) );
 VLC_EXPORT(void, EndMD5, ( struct md5_s * ) );
-VLC_EXPORT(void, Digest, ( struct md5_s *, uint32_t * ) );
+
+/**
+ * Returns a char representation of the md5 hash, as shown by UNIX md5 or
+ * md5sum tools.
+ */
+static inline char * psz_md5_hash( struct md5_s *md5_s )
+{
+    char *psz = malloc( 33 ); /* md5 string is 32 bytes + NULL character */
+    if( !psz ) return NULL;
+
+    int i;
+    for ( i = 0; i < 4; i++ )
+    {
+        sprintf( &psz[8*i], "%02x%02x%02x%02x",
+            md5_s->p_digest[i] & 0xff,
+            ( md5_s->p_digest[i] >> 8 ) & 0xff,
+            ( md5_s->p_digest[i] >> 16 ) & 0xff,
+            md5_s->p_digest[i] >> 24
+        );
+    }
+    psz[32] = '\0';
+
+    return psz;
+}
 
 #endif