diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:24:58 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:24:58 +0200 |
| commit | 3db384424bd7398ffbb7a355cab8f15f3add009f (patch) | |
| tree | 4536961c62454aca3ac87ee88229e4d20c0d44fa /spectro/ccxxmake.c | |
| parent | d479dd1aab1c1cb907932c6595b0ef33523fc797 (diff) | |
New upstream version 1.9.1+repackupstream/1.9.1+repack
Diffstat (limited to 'spectro/ccxxmake.c')
| -rw-r--r-- | spectro/ccxxmake.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spectro/ccxxmake.c b/spectro/ccxxmake.c index 418affc..740eb0a 100644 --- a/spectro/ccxxmake.c +++ b/spectro/ccxxmake.c @@ -500,7 +500,7 @@ int main(int argc, char *argv[]) { fa = nfa; if (na == NULL) usage(0,"Paramater expected following -W"); if (na[0] == 'n' || na[0] == 'N') - fc = fc_none; + fc = fc_None; else if (na[0] == 'h' || na[0] == 'H') fc = fc_Hardware; else if (na[0] == 'x' || na[0] == 'X') @@ -1441,11 +1441,12 @@ int main(int argc, char *argv[]) { strcat(colname, ")"); } if (description == NULL) { - if ((description = malloc(strlen(colname) + strlen(displayname) + 4)) == NULL) + char *disp = displayname != NULL ? displayname : dtinfo->desc; + if ((description = malloc(strlen(colname) + strlen(disp) + 4)) == NULL) error("Malloc failed"); strcpy(description, colname); strcat(description, " & "); - strcat(description, displayname); + strcat(description, disp); } if (refrmode < 0) |