[libbluray-devel] [Git][videolan/libbluray][master] 3 commits: Tune doxygen config

[Petri Hintukainen (@hpi)]

Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
4a3f5cca by Petri Hintukainen at 2022-10-04T12:10:16+03:00
Tune doxygen config

- - - - -
692a79f9 by Petri Hintukainen at 2022-10-04T12:14:35+03:00
bd_info: replace realloc() with stack allocated buffer

- - - - -
eb51ac1e by Petri Hintukainen at 2022-10-04T12:16:09+03:00
bluray-version.h: add comments

- - - - -


3 changed files:

- doc/doxygen-config
- src/examples/bd_info.c
- src/libbluray/bluray-version.h.in


Changes:

=====================================
doc/doxygen-config
=====================================
@@ -140,7 +140,7 @@ INLINE_INHERITED_MEMB  = NO
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO
 
 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
@@ -177,7 +177,7 @@ SHORT_NAMES            = NO
 # description.)
 # The default value is: NO.
 
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
 
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
@@ -242,7 +242,7 @@ TCL_SUBST              =
 # members will be omitted, etc.
 # The default value is: NO.
 
-OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_FOR_C  = YES
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
 # Python sources only. Doxygen will then generate output that is more tailored
@@ -398,7 +398,7 @@ INLINE_SIMPLE_STRUCTS  = NO
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 # The default value is: NO.
 
-TYPEDEF_HIDES_STRUCT   = NO
+TYPEDEF_HIDES_STRUCT   = YES
 
 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
 # cache is used to resolve symbols given their name and scope. Since this can be
@@ -1443,7 +1443,7 @@ GENERATE_TREEVIEW      = NO
 # Minimum value: 0, maximum value: 20, default value: 4.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-ENUM_VALUES_PER_LINE   = 4
+ENUM_VALUES_PER_LINE   = 1
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
 # to set the initial width (in pixels) of the frame in which the tree is shown.


=====================================
src/examples/bd_info.c
=====================================
@@ -48,19 +48,14 @@ static const char *_num2str(char *buf, size_t buf_size, int i)
     return "<undefined>";
 }
 
-static const char *_hex2str(const uint8_t *data, size_t len)
+static const char *_hex2str(char *str, size_t str_size, const uint8_t *data, size_t len)
 {
-    static char *str = NULL;
     size_t i;
 
+    if (str_size < 3 || (str_size-1)/2 < len)
+        return "<overflow>";
 
-    char *tmp = (char*)realloc(str, 2*len + 1);
-    if (tmp)
-        str = tmp;
-    else
-        return "";
     *str = 0;
-
     for (i = 0; i < len; i++) {
         sprintf(str+2*i, "%02X", data[i]);
     }
@@ -211,7 +206,8 @@ int main(int argc, char *argv[])
     if (info->aacs_detected) {
         printf("libaacs detected    : %s\n", _yes_no(info->libaacs_detected));
         if (info->libaacs_detected) {
-          printf("Disc ID             : %s\n", _hex2str(info->disc_id, sizeof(info->disc_id)));
+          char buf[sizeof(info->disc_id) * 2 + 1];
+          printf("Disc ID             : %s\n", _hex2str(buf, sizeof(buf), info->disc_id, sizeof(info->disc_id)));
           printf("AACS MKB version    : %d\n", info->aacs_mkbv);
           printf("AACS handled        : %s\n", _yes_no(info->aacs_handled));
           if (!info->aacs_handled) {


=====================================
src/libbluray/bluray-version.h.in
=====================================
@@ -25,17 +25,25 @@
 #ifndef BLURAY_VERSION_H_
 #define BLURAY_VERSION_H_
 
+/** Pack version number to single integer */
 #define BLURAY_VERSION_CODE(major, minor, micro) \
     (((major) * 10000) +                         \
      ((minor) *   100) +                         \
      ((micro) *     1))
 
+/** libbluray major version number */
 #define BLURAY_VERSION_MAJOR @BLURAY_VERSION_MAJOR@
+
+/** libbluray minor version number */
 #define BLURAY_VERSION_MINOR @BLURAY_VERSION_MINOR@
+
+/** libbluray micro version number */
 #define BLURAY_VERSION_MICRO @BLURAY_VERSION_MICRO@
 
+/** libbluray version number as a string */
 #define BLURAY_VERSION_STRING "@BLURAY_VERSION_MAJOR at .@BLURAY_VERSION_MINOR at .@BLURAY_VERSION_MICRO@"
 
+/** libbluray version number as a single integer */
 #define BLURAY_VERSION \
     BLURAY_VERSION_CODE(BLURAY_VERSION_MAJOR, BLURAY_VERSION_MINOR, BLURAY_VERSION_MICRO)
 



View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/6e63d7785b1ff8c9a9866b0acf892a4d1dd8090a...eb51ac1e56adf55b8197a99e9961fcc71c167fcf

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/6e63d7785b1ff8c9a9866b0acf892a4d1dd8090a...eb51ac1e56adf55b8197a99e9961fcc71c167fcf
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance