Changeset 8071

Timestamp:

Mar 17, 2009, 6:08:02 PM (14 years ago)

Author:

charles

Message:

(trunk libT) make tr-getopt C++ friendly

Location:

trunk/libtransmission

Files:

• bencode.c (modified) (1 diff)
• bencode.h (modified) (1 diff)
• tr-getopt.c (modified) (1 diff)
• tr-getopt.h (modified) (2 diffs)

trunk/libtransmission/bencode.c

@@ -1332 +1332 @@
 }
 
+char*
+tr_bencToJSON( const tr_benc * top )
+{
+    char * ret;
+    struct evbuffer * buf = evbuffer_new( );
+    tr_bencSaveAsJSON( top, buf );
+    ret = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
+    evbuffer_free( buf );
+    return ret;
+}
+
 /***
 ****

trunk/libtransmission/bencode.h

@@ -80 +80 @@
 
 char*     tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out );
+
+char*     tr_bencToJSON( const tr_benc * top );
 
 int       tr_bencSaveFile( const char * filename, const tr_benc * );

trunk/libtransmission/tr-getopt.c

@@ -217 +217 @@
     return o->val;
 }
-

trunk/libtransmission/tr-getopt.h

@@ -25 +25 @@
 #ifndef TR_GETOPT_H
 #define TR_GETOPT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 extern int tr_optind;
@@ -66 +70 @@
                       const tr_option * opts );
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif /* TR_GETOPT_H */