Changed most "backticks" (grave accents) into apostrophes.
Quotations that are embraced by tick marks now look better, in most fonts.
This commit is contained in:
@@ -89,7 +89,7 @@ static unsigned GetBytesPerLine (const Collection* A)
|
||||
const char* V = GetAttrVal (A, "bytesperline");
|
||||
if ((V && sscanf (V, "%u%c", &BytesPerLine, &C) != 1) ||
|
||||
(BytesPerLine < 1 || BytesPerLine > 64)) {
|
||||
Error ("Invalid value for attribute `bytesperline'");
|
||||
Error ("Invalid value for attribute 'bytesperline'");
|
||||
}
|
||||
return BytesPerLine;
|
||||
}
|
||||
@@ -106,7 +106,7 @@ static unsigned GetBase (const Collection* A)
|
||||
const char* V = GetAttrVal (A, "base");
|
||||
if ((V && sscanf (V, "%u%c", &Base, &C) != 1) ||
|
||||
(Base != 2 && Base != 10 && Base != 16)) {
|
||||
Error ("Invalid value for attribute `base'");
|
||||
Error ("Invalid value for attribute 'base'");
|
||||
}
|
||||
return Base;
|
||||
}
|
||||
@@ -119,7 +119,7 @@ static const char* GetIdentifier (const Collection* A)
|
||||
/* Check for a ident attribute */
|
||||
const char* Ident = GetAttrVal (A, "ident");
|
||||
if (Ident && !ValidIdentifier (Ident)) {
|
||||
Error ("Invalid value for attribute `ident'");
|
||||
Error ("Invalid value for attribute 'ident'");
|
||||
}
|
||||
return Ident;
|
||||
}
|
||||
@@ -152,7 +152,7 @@ void WriteAsmFile (const StrBuf* Data, const Collection* A, const Bitmap* B)
|
||||
/* Open the output file */
|
||||
F = fopen (Name, "w");
|
||||
if (F == 0) {
|
||||
Error ("Cannot open output file `%s': %s", Name, strerror (errno));
|
||||
Error ("Cannot open output file '%s': %s", Name, strerror (errno));
|
||||
}
|
||||
|
||||
/* Write a readable header */
|
||||
@@ -235,6 +235,6 @@ void WriteAsmFile (const StrBuf* Data, const Collection* A, const Bitmap* B)
|
||||
|
||||
/* Close the file */
|
||||
if (fclose (F) != 0) {
|
||||
Error ("Error closing output file `%s': %s", Name, strerror (errno));
|
||||
Error ("Error closing output file '%s': %s", Name, strerror (errno));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ const Attr* NeedAttr (const Collection* C, const char* Name, const char* Op)
|
||||
/* Search for the attribute and return it */
|
||||
unsigned Index;
|
||||
if (!FindAttr (C, Name, &Index)) {
|
||||
Error ("Found no attribute named `%s' for operation %s", Name, Op);
|
||||
Error ("Found no attribute named '%s' for operation %s", Name, Op);
|
||||
}
|
||||
return CollConstAt (C, Index);
|
||||
}
|
||||
@@ -201,7 +201,7 @@ void AddAttr (Collection* C, const char* Name, const char* Value)
|
||||
*/
|
||||
unsigned Index;
|
||||
if (FindAttr (C, Name, &Index)) {
|
||||
Error ("Duplicate command line attribute `%s'", Name);
|
||||
Error ("Duplicate command line attribute '%s'", Name);
|
||||
}
|
||||
|
||||
/* Insert the attribute */
|
||||
@@ -221,7 +221,7 @@ void SplitAddAttr (Collection* C, const char* Combined, const char* Name)
|
||||
if (Pos == 0) {
|
||||
/* Combined is actually a value */
|
||||
if (Name == 0) {
|
||||
Error ("Command line attribute `%s' doesn't contain a name", Combined);
|
||||
Error ("Command line attribute '%s' doesn't contain a name", Combined);
|
||||
}
|
||||
AddAttr (C, Name, Combined);
|
||||
} else {
|
||||
|
||||
@@ -65,7 +65,7 @@ void WriteBinFile (const StrBuf* Data, const Collection* A,
|
||||
/* Open the output file */
|
||||
FILE* F = fopen (Name, "wb");
|
||||
if (F == 0) {
|
||||
Error ("Cannot open output file `%s': %s", Name, strerror (errno));
|
||||
Error ("Cannot open output file '%s': %s", Name, strerror (errno));
|
||||
}
|
||||
|
||||
/* Write to the file. We will use fwrite here instead of the fileio
|
||||
@@ -75,11 +75,11 @@ void WriteBinFile (const StrBuf* Data, const Collection* A,
|
||||
*/
|
||||
Size = SB_GetLen (Data);
|
||||
if (fwrite (SB_GetConstBuf (Data), 1, Size, F) != Size) {
|
||||
Error ("Error writing to output file `%s': %s", Name, strerror (errno));
|
||||
Error ("Error writing to output file '%s': %s", Name, strerror (errno));
|
||||
}
|
||||
|
||||
/* Close the file */
|
||||
if (fclose (F) != 0) {
|
||||
Error ("Error closing output file `%s': %s", Name, strerror (errno));
|
||||
Error ("Error closing output file '%s': %s", Name, strerror (errno));
|
||||
}
|
||||
}
|
||||
|
||||
10
src/sp65/c.c
10
src/sp65/c.c
@@ -89,7 +89,7 @@ static unsigned GetBytesPerLine (const Collection* A)
|
||||
const char* V = GetAttrVal (A, "bytesperline");
|
||||
if ((V && sscanf (V, "%u%c", &BytesPerLine, &C) != 1) ||
|
||||
(BytesPerLine < 1 || BytesPerLine > 64)) {
|
||||
Error ("Invalid value for attribute `bytesperline'");
|
||||
Error ("Invalid value for attribute 'bytesperline'");
|
||||
}
|
||||
return BytesPerLine;
|
||||
}
|
||||
@@ -105,7 +105,7 @@ static unsigned GetBase (const Collection* A)
|
||||
/* Check for a base attribute */
|
||||
const char* V = GetAttrVal (A, "base");
|
||||
if ((V && sscanf (V, "%u%c", &Base, &C) != 1) || (Base != 10 && Base != 16)) {
|
||||
Error ("Invalid value for attribute `base'");
|
||||
Error ("Invalid value for attribute 'base'");
|
||||
}
|
||||
return Base;
|
||||
}
|
||||
@@ -118,7 +118,7 @@ static const char* GetIdentifier (const Collection* A)
|
||||
/* Check for a ident attribute */
|
||||
const char* Ident = GetAttrVal (A, "ident");
|
||||
if (Ident && !ValidIdentifier (Ident)) {
|
||||
Error ("Invalid value for attribute `ident'");
|
||||
Error ("Invalid value for attribute 'ident'");
|
||||
}
|
||||
return Ident;
|
||||
}
|
||||
@@ -151,7 +151,7 @@ void WriteCFile (const StrBuf* Data, const Collection* A, const Bitmap* B)
|
||||
/* Open the output file */
|
||||
F = fopen (Name, "w");
|
||||
if (F == 0) {
|
||||
Error ("Cannot open output file `%s': %s", Name, strerror (errno));
|
||||
Error ("Cannot open output file '%s': %s", Name, strerror (errno));
|
||||
}
|
||||
|
||||
/* Write a readable header */
|
||||
@@ -220,6 +220,6 @@ void WriteCFile (const StrBuf* Data, const Collection* A, const Bitmap* B)
|
||||
|
||||
/* Close the file */
|
||||
if (fclose (F) != 0) {
|
||||
Error ("Error closing output file `%s': %s", Name, strerror (errno));
|
||||
Error ("Error closing output file '%s': %s", Name, strerror (errno));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ StrBuf* ConvertTo (const Bitmap* B, const Collection* A)
|
||||
sizeof (ConverterMap[0]),
|
||||
Compare);
|
||||
if (E == 0) {
|
||||
Error ("No such target format: `%s'", Format);
|
||||
Error ("No such target format: '%s'", Format);
|
||||
}
|
||||
|
||||
/* Do the conversion */
|
||||
|
||||
@@ -103,7 +103,7 @@ Bitmap* ReadInputFile (const Collection* A)
|
||||
sizeof (FormatTable[0]),
|
||||
CompareFileId);
|
||||
if (F == 0) {
|
||||
Error ("Unknown input format `%s'", Format);
|
||||
Error ("Unknown input format '%s'", Format);
|
||||
}
|
||||
} else {
|
||||
/* No format given, use file name extension */
|
||||
@@ -112,7 +112,7 @@ Bitmap* ReadInputFile (const Collection* A)
|
||||
sizeof (FormatTable) / sizeof (FormatTable[0]));
|
||||
/* Found? */
|
||||
if (F == 0) {
|
||||
Error ("Cannot determine file format of input file `%s'", Name);
|
||||
Error ("Cannot determine file format of input file '%s'", Name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ static enum Mode GetMode (const Collection* A)
|
||||
} else if (strcmp (Mode, "shaped") == 0) {
|
||||
return smShaped;
|
||||
} else {
|
||||
Error ("Invalid value for attribute `mode'");
|
||||
Error ("Invalid value for attribute 'mode'");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -392,7 +392,7 @@ int main (int argc, char* argv [])
|
||||
}
|
||||
} else {
|
||||
/* We don't accept anything else */
|
||||
AbEnd ("Don't know what to do with `%s'", Arg);
|
||||
AbEnd ("Don't know what to do with '%s'", Arg);
|
||||
}
|
||||
|
||||
/* Next argument */
|
||||
|
||||
@@ -124,7 +124,7 @@ void WriteOutputFile (const StrBuf* Data, const Collection* A, const Bitmap* B)
|
||||
sizeof (FormatTable[0]),
|
||||
CompareFileId);
|
||||
if (F == 0) {
|
||||
Error ("Unknown output format `%s'", Format);
|
||||
Error ("Unknown output format '%s'", Format);
|
||||
}
|
||||
} else {
|
||||
/* No format given, use file name extension */
|
||||
@@ -133,7 +133,7 @@ void WriteOutputFile (const StrBuf* Data, const Collection* A, const Bitmap* B)
|
||||
sizeof (FormatTable) / sizeof (FormatTable[0]));
|
||||
/* Found? */
|
||||
if (F == 0) {
|
||||
Error ("Cannot determine file format of output file `%s'", Name);
|
||||
Error ("Cannot determine file format of output file '%s'", Name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -146,10 +146,10 @@ static PCXHeader* ReadPCXHeader (FILE* F, const char* Name)
|
||||
|
||||
/* Check the header data */
|
||||
if (P->Id != PCX_MAGIC_ID || P->FileVersion == 1 || P->FileVersion > 5) {
|
||||
Error ("`%s' is not a PCX file", Name);
|
||||
Error ("'%s' is not a PCX file", Name);
|
||||
}
|
||||
if (P->Compressed > 1) {
|
||||
Error ("Unsupported compression (%d) in PCX file `%s'",
|
||||
Error ("Unsupported compression (%d) in PCX file '%s'",
|
||||
P->Compressed, Name);
|
||||
}
|
||||
/* We support:
|
||||
@@ -160,15 +160,15 @@ static PCXHeader* ReadPCXHeader (FILE* F, const char* Name)
|
||||
if (!((P->BPP == 1 && P->Planes == 1) ||
|
||||
(P->BPP == 8 && (P->Planes == 1 || P->Planes == 3 || P->Planes == 4)))) {
|
||||
/* We could support others, but currently we don't */
|
||||
Error ("Unsupported PCX format: %u planes, %u bpp in PCX file `%s'",
|
||||
Error ("Unsupported PCX format: %u planes, %u bpp in PCX file '%s'",
|
||||
P->Planes, P->BPP, Name);
|
||||
}
|
||||
if (P->PalInfo != 1 && P->PalInfo != 2) {
|
||||
Error ("Unsupported palette info (%u) in PCX file `%s'",
|
||||
Error ("Unsupported palette info (%u) in PCX file '%s'",
|
||||
P->PalInfo, Name);
|
||||
}
|
||||
if (!ValidBitmapSize (P->Width, P->Height)) {
|
||||
Error ("PCX file `%s' has an unsupported size (w=%u, h=%d)",
|
||||
Error ("PCX file '%s' has an unsupported size (w=%u, h=%d)",
|
||||
Name, P->Width, P->Height);
|
||||
}
|
||||
|
||||
@@ -261,7 +261,7 @@ Bitmap* ReadPCXFile (const Collection* A)
|
||||
/* Open the file */
|
||||
FILE* F = fopen (Name, "rb");
|
||||
if (F == 0) {
|
||||
Error ("Cannot open PCX file `%s': %s", Name, strerror (errno));
|
||||
Error ("Cannot open PCX file '%s': %s", Name, strerror (errno));
|
||||
}
|
||||
|
||||
/* Read the PCX header */
|
||||
@@ -357,7 +357,7 @@ Bitmap* ReadPCXFile (const Collection* A)
|
||||
|
||||
/* Check for palette marker */
|
||||
if (Read8 (F) != 0x0C) {
|
||||
Error ("Invalid palette marker in PCX file `%s'", Name);
|
||||
Error ("Invalid palette marker in PCX file '%s'", Name);
|
||||
}
|
||||
|
||||
} else if (EndPos == CurPos) {
|
||||
@@ -367,12 +367,12 @@ Bitmap* ReadPCXFile (const Collection* A)
|
||||
|
||||
/* Check the maximum index for safety */
|
||||
if (MaxIdx > 15) {
|
||||
Error ("PCX file `%s' contains more than 16 indexed colors "
|
||||
Error ("PCX file '%s' contains more than 16 indexed colors "
|
||||
"but no extra palette", Name);
|
||||
}
|
||||
|
||||
} else {
|
||||
Error ("Error in PCX file `%s': %lu bytes at end of pixel data",
|
||||
Error ("Error in PCX file '%s': %lu bytes at end of pixel data",
|
||||
Name, EndPos - CurPos);
|
||||
}
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ static enum Mode GetMode (const Collection* A)
|
||||
} else if (strcmp (Mode, "multicolor") == 0) {
|
||||
return smMultiColor;
|
||||
} else {
|
||||
Error ("Invalid value for attribute `mode'");
|
||||
Error ("Invalid value for attribute 'mode'");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user