Mercurial > hg > sidinfo

changeset 385:1049033c6bbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backwards-incompatible change in UX: renamed the 'Copyright' field to 'Released', as it should be per PSID convention.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 01 Jan 2022 16:25:17 +0200
parents c92b144a44cd
children 94ff750679a6
files sidinfo.c sidlib.c sidlib.h
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/sidinfo.c	Sat Jan 01 16:21:53 2022 +0200
+++ b/sidinfo.c	Sat Jan 01 16:25:17 2022 +0200
@@ -87,7 +87,7 @@
 
     { "Name"         , NULL                   , OTYPE_STR    , NULL },
     { "Author"       , NULL                   , OTYPE_STR    , NULL },
-    { "Copyright"    , NULL                   , OTYPE_STR    , NULL },
+    { "Released"     , NULL                   , OTYPE_STR    , NULL },
     { "Hash"         , NULL                   , OTYPE_STR    , NULL },
 
     { "Songlengths"  , "Song lengths"         , OTYPE_OTHER  , NULL },
@@ -171,14 +171,14 @@
 
     printf(
         "\n"
-        "Example: %s -x -p -f hash,copyright somesidfile.sid\n"
+        "Example: %s -x -p -f hash,released somesidfile.sid\n"
         "\n"
         "Format strings for '-F' option are composed of @fields@ that get expanded\n"
         "to their value. Also, escape sequences \\r, \\n and \\t can be used:\n"
-        "  -F \"hash=@hash@\\ncopy=@copyright@\\n\"\n"
+        "  -F \"hash=@hash@\\ncopy=@released@\\n\"\n"
         "\n"
         "The -F fields can be further formatted via printf-style specifiers:\n"
-        "  -F \"@copyright:'%%-30s'@\"\n"
+        "  -F \"@released:'%%-30s'@\"\n"
         "\n"
         "NOTE: One line output (-l <field separator>) also sets escape characters\n"
         "(option -e <chars>), if escape characters have NOT been separately set.\n"
@@ -890,7 +890,7 @@
 
         case 20: PRS(psid->sidName, TRUE); break;
         case 21: PRS(psid->sidAuthor, TRUE); break;
-        case 22: PRS(psid->sidCopyright, TRUE); break;
+        case 22: PRS(psid->sidReleased, TRUE); break;
 
         case 23:
             {
--- a/sidlib.c	Sat Jan 01 16:21:53 2022 +0200
+++ b/sidlib.c	Sat Jan 01 16:25:17 2022 +0200
@@ -158,7 +158,7 @@
 
     if (!sidlib_fread_str(ctx, chconv, &psid->sidName, SIDLIB_PSID_STR_LEN) ||
         !sidlib_fread_str(ctx, chconv, &psid->sidAuthor, SIDLIB_PSID_STR_LEN) ||
-        !sidlib_fread_str(ctx, chconv, &psid->sidCopyright, SIDLIB_PSID_STR_LEN))
+        !sidlib_fread_str(ctx, chconv, &psid->sidReleased, SIDLIB_PSID_STR_LEN))
     {
         ret = th_io_error(ctx, ctx->status,
             "Error reading SID file header data.");
@@ -283,7 +283,7 @@
     {
         th_free(psid->sidName);
         th_free(psid->sidAuthor);
-        th_free(psid->sidCopyright);
+        th_free(psid->sidReleased);
 
         if (psid->allocated)
             th_free(psid);
--- a/sidlib.h	Sat Jan 01 16:21:53 2022 +0200
+++ b/sidlib.h	Sat Jan 01 16:25:17 2022 +0200
@@ -132,7 +132,7 @@
 
     char *sidName;       // Descriptive text-fields, ASCIIZ
     char *sidAuthor;     // Converted through SIDLibChConvCtx if conversion is used
-    char *sidCopyright;
+    char *sidReleased;
 
     // PSIDv2+ data
     uint16_t flags;      // Flags