Commit 22d7a5db authored by Claes Sjofors's avatar Claes Sjofors

Bugfix for nodenames larger than 31 characters

parent e1ea4506
...@@ -1040,14 +1040,10 @@ ini_ReadBootFile ( ...@@ -1040,14 +1040,10 @@ ini_ReadBootFile (
int n; int n;
int nvol; int nvol;
#if 1 char plcname[256];
pwr_tObjName vname; char vname[80];
char vids[80];
pwr_tVolumeId vid;
#else
char vids[80]; char vids[80];
pwr_tVolumeId vid; pwr_tVolumeId vid;
#endif
/* pwr_tProjVersion ver;*/ /* pwr_tProjVersion ver;*/
FILE *f; FILE *f;
...@@ -1094,14 +1090,14 @@ ini_ReadBootFile ( ...@@ -1094,14 +1090,14 @@ ini_ReadBootFile (
i++; i++;
n = sscanf(s, "%s %s", vname, vids); n = sscanf(s, "%s %s", plcname, vids);
if (n < 2) { if (n < 2) {
errh_LogError(&cp->log, "Bootfile corrupt, error in plc data"); errh_LogError(&cp->log, "Bootfile corrupt, error in plc data");
cp->errors++; cp->errors++;
continue; continue;
} }
t = strrchr( vname, '_'); t = strrchr( plcname, '_');
n = sscanf(t+1, "%d", &cp->node.plcVersion); n = sscanf(t+1, "%d", &cp->node.plcVersion);
if (n < 1) { if (n < 1) {
errh_LogError(&cp->log, "Bootfile corrupt, error in plc data"); errh_LogError(&cp->log, "Bootfile corrupt, error in plc data");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment