Re: [Libcdio-devel] [PATCH v2 0/2] Add Rock Ridge CE record processing

[Thomas Schmitt]

Hi,

patch 1 looks reasonable and harmless.

Although i would buffer the CE parameters rather than reading immediately
and buffering the next continuation area block, patch 2 looks good to me,
too.


But the patches in my mailbox are not digestible for "git am" or patch.
Neither stored by the mail program nor cut out of the mailbox file by
help of a text editor.

"git am" complains:
  Applying: Clean up rock.h and fix the use of signed chars in iso_su_ce_s
  fatal: corrupt patch at line 36

"patch -p1 -b --dry-run" says:
  checking file include/cdio/rock.h
  patch: **** malformed patch at line 47: @@ -165,7 +165,7 @@ typedef struct 
iso_rock_sl_part_s {

The line counting differs by commit message and by particular line in the
hunk. But the hunk is the same:
--------------------------------------------------------------------
@@ -165,7 +165,7 @@ typedef struct iso_rock_sl_part_s {
   /*! Symbolic link. See Rock Ridge Section 4.1.3 */
  typedef struct iso_rock_sl_s {
-  unsigned char flags;
+  uint8_t flags;
    iso_rock_sl_part_t link;
  } GNUC_PACKED iso_rock_sl_t ;
  @@ -184,7 +184,7 @@ typedef enum {
    typedef struct iso_rock_nm_s {
-  unsigned char flags;
+  uint8_t flags;
    char name[EMPTY_ARRAY_SIZE];
  } GNUC_PACKED iso_rock_nm_t ;
  -- 2.39.1.windows.1
--------------------------------------------------------------------

My own impression is that there are surplus blanks at the line starts,
even before the hunk that gets mentioned by the programs. Further the
@@-numbers say that there are context lines missing.
But trying to rectify those lines does not yield much progress.
(I'm neither good in git nor in patch.)


Have a nice day :)

Thomas