Skip to content
Snippets Groups Projects
Commit 6297136a authored by rswindell's avatar rswindell
Browse files

Wrap errno strings in error messages in single-quotes instead of parenthesis.

parent d3f0a3e0
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/smblib/smbadd.c
+ 6
− 6
View file @ 6297136a
...@@ -172,7 +172,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash ...@@ -172,7 +172,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash
if(xlat!=XLAT_NONE) { /* e.g. XLAT_LZH */ if(xlat!=XLAT_NONE) { /* e.g. XLAT_LZH */
if(smb_fwrite(smb,&xlat,sizeof(xlat),smb->sdt_fp)!=sizeof(xlat)) { if(smb_fwrite(smb,&xlat,sizeof(xlat),smb->sdt_fp)!=sizeof(xlat)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing body xlat string" ,"%d '%s' writing body xlat string"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
retval=SMB_ERR_WRITE; retval=SMB_ERR_WRITE;
break; break;
...@@ -182,7 +182,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash ...@@ -182,7 +182,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash
xlat=XLAT_NONE; /* xlat string terminator */ xlat=XLAT_NONE; /* xlat string terminator */
if(smb_fwrite(smb,&xlat,sizeof(xlat),smb->sdt_fp)!=sizeof(xlat)) { if(smb_fwrite(smb,&xlat,sizeof(xlat),smb->sdt_fp)!=sizeof(xlat)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing body xlat terminator" ,"%d '%s' writing body xlat terminator"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
retval=SMB_ERR_WRITE; retval=SMB_ERR_WRITE;
break; break;
...@@ -191,7 +191,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash ...@@ -191,7 +191,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash
if(smb_fwrite(smb,body,bodylen,smb->sdt_fp)!=bodylen) { if(smb_fwrite(smb,body,bodylen,smb->sdt_fp)!=bodylen) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing body (%ld bytes)" ,"%d '%s' writing body (%ld bytes)"
,get_errno(),STRERROR(get_errno()) ,get_errno(),STRERROR(get_errno())
,bodylen); ,bodylen);
retval=SMB_ERR_WRITE; retval=SMB_ERR_WRITE;
...@@ -206,7 +206,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash ...@@ -206,7 +206,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash
xlat=XLAT_NONE; /* xlat string terminator */ xlat=XLAT_NONE; /* xlat string terminator */
if(smb_fwrite(smb,&xlat,sizeof(xlat),smb->sdt_fp)!=sizeof(xlat)) { if(smb_fwrite(smb,&xlat,sizeof(xlat),smb->sdt_fp)!=sizeof(xlat)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing tail xlat terminator" ,"%d '%s' writing tail xlat terminator"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
retval=SMB_ERR_WRITE; retval=SMB_ERR_WRITE;
break; break;
...@@ -214,7 +214,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash ...@@ -214,7 +214,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash
if(smb_fwrite(smb,tail,taillen-sizeof(xlat),smb->sdt_fp)!=taillen-sizeof(xlat)) { if(smb_fwrite(smb,tail,taillen-sizeof(xlat),smb->sdt_fp)!=taillen-sizeof(xlat)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing tail (%ld bytes)" ,"%d '%s' writing tail (%ld bytes)"
,get_errno(),STRERROR(get_errno()) ,get_errno(),STRERROR(get_errno())
,taillen-sizeof(xlat)); ,taillen-sizeof(xlat));
retval=SMB_ERR_WRITE; retval=SMB_ERR_WRITE;
...@@ -228,7 +228,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash ...@@ -228,7 +228,7 @@ int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hash
} }
if(l%SDT_BLOCK_LEN) { if(l%SDT_BLOCK_LEN) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing data padding" ,"%d '%s' writing data padding"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
retval=SMB_ERR_WRITE; retval=SMB_ERR_WRITE;
break; break;
......
src/smblib/smballoc.c
+ 11
− 11
View file @ 6297136a
...@@ -82,7 +82,7 @@ long SMBCALL smb_allocdat(smb_t* smb, ulong length, ushort refs) ...@@ -82,7 +82,7 @@ long SMBCALL smb_allocdat(smb_t* smb, ulong length, ushort refs)
for(l=0;l<blocks;l++) for(l=0;l<blocks;l++)
if(!fwrite(&refs,sizeof(refs),1,smb->sda_fp)) { if(!fwrite(&refs,sizeof(refs),1,smb->sda_fp)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing allocation bytes at offset %ld" ,"%d '%s' writing allocation bytes at offset %ld"
,get_errno(),STRERROR(get_errno()) ,get_errno(),STRERROR(get_errno())
,((offset/SDT_BLOCK_LEN)+l)*sizeof(refs)); ,((offset/SDT_BLOCK_LEN)+l)*sizeof(refs));
return(SMB_ERR_WRITE); return(SMB_ERR_WRITE);
...@@ -121,7 +121,7 @@ long SMBCALL smb_fallocdat(smb_t* smb, ulong length, ushort refs) ...@@ -121,7 +121,7 @@ long SMBCALL smb_fallocdat(smb_t* smb, ulong length, ushort refs)
fflush(smb->sda_fp); fflush(smb->sda_fp);
if(l<blocks) { if(l<blocks) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing allocation bytes" ,"%d '%s' writing allocation bytes"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
return(SMB_ERR_WRITE); return(SMB_ERR_WRITE);
} }
...@@ -156,7 +156,7 @@ int SMBCALL smb_freemsgdat(smb_t* smb, ulong offset, ulong length, ushort refs) ...@@ -156,7 +156,7 @@ int SMBCALL smb_freemsgdat(smb_t* smb, ulong offset, ulong length, ushort refs)
sda_offset=((offset/SDT_BLOCK_LEN)+l)*sizeof(i); sda_offset=((offset/SDT_BLOCK_LEN)+l)*sizeof(i);
if(fseek(smb->sda_fp,sda_offset,SEEK_SET)) { if(fseek(smb->sda_fp,sda_offset,SEEK_SET)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) seeking to %lu (0x%lX) of allocation file" ,"%d '%s' seeking to %lu (0x%lX) of allocation file"
,get_errno(),STRERROR(get_errno()) ,get_errno(),STRERROR(get_errno())
,sda_offset,sda_offset); ,sda_offset,sda_offset);
retval=SMB_ERR_SEEK; retval=SMB_ERR_SEEK;
...@@ -164,7 +164,7 @@ int SMBCALL smb_freemsgdat(smb_t* smb, ulong offset, ulong length, ushort refs) ...@@ -164,7 +164,7 @@ int SMBCALL smb_freemsgdat(smb_t* smb, ulong offset, ulong length, ushort refs)
} }
if(smb_fread(smb,&i,sizeof(i),smb->sda_fp)!=sizeof(i)) { if(smb_fread(smb,&i,sizeof(i),smb->sda_fp)!=sizeof(i)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) reading allocation bytes at offset %ld" ,"%d '%s' reading allocation bytes at offset %ld"
,get_errno(),STRERROR(get_errno()) ,get_errno(),STRERROR(get_errno())
,sda_offset); ,sda_offset);
retval=SMB_ERR_READ; retval=SMB_ERR_READ;
...@@ -176,14 +176,14 @@ int SMBCALL smb_freemsgdat(smb_t* smb, ulong offset, ulong length, ushort refs) ...@@ -176,14 +176,14 @@ int SMBCALL smb_freemsgdat(smb_t* smb, ulong offset, ulong length, ushort refs)
i-=refs; i-=refs;
if(fseek(smb->sda_fp,-(int)sizeof(i),SEEK_CUR)) { if(fseek(smb->sda_fp,-(int)sizeof(i),SEEK_CUR)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) seeking backwards 2 bytes in allocation file" ,"%d '%s' seeking backwards 2 bytes in allocation file"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
retval=SMB_ERR_SEEK; retval=SMB_ERR_SEEK;
break; break;
} }
if(!fwrite(&i,sizeof(i),1,smb->sda_fp)) { if(!fwrite(&i,sizeof(i),1,smb->sda_fp)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing allocation bytes at offset %ld" ,"%d '%s' writing allocation bytes at offset %ld"
,get_errno(),STRERROR(get_errno()) ,get_errno(),STRERROR(get_errno())
,sda_offset); ,sda_offset);
retval=SMB_ERR_WRITE; retval=SMB_ERR_WRITE;
...@@ -217,7 +217,7 @@ int SMBCALL smb_incdat(smb_t* smb, ulong offset, ulong length, ushort refs) ...@@ -217,7 +217,7 @@ int SMBCALL smb_incdat(smb_t* smb, ulong offset, ulong length, ushort refs)
} }
if(smb_fread(smb,&i,sizeof(i),smb->sda_fp)!=sizeof(i)) { if(smb_fread(smb,&i,sizeof(i),smb->sda_fp)!=sizeof(i)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) reading allocation record at offset %ld" ,"%d '%s' reading allocation record at offset %ld"
,get_errno(),STRERROR(get_errno()) ,get_errno(),STRERROR(get_errno())
,((offset/SDT_BLOCK_LEN)+l)*sizeof(i)); ,((offset/SDT_BLOCK_LEN)+l)*sizeof(i));
return(SMB_ERR_READ); return(SMB_ERR_READ);
...@@ -228,7 +228,7 @@ int SMBCALL smb_incdat(smb_t* smb, ulong offset, ulong length, ushort refs) ...@@ -228,7 +228,7 @@ int SMBCALL smb_incdat(smb_t* smb, ulong offset, ulong length, ushort refs)
} }
if(!fwrite(&i,sizeof(i),1,smb->sda_fp)) { if(!fwrite(&i,sizeof(i),1,smb->sda_fp)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing allocation record at offset %ld" ,"%d '%s' writing allocation record at offset %ld"
,get_errno(),STRERROR(get_errno()) ,get_errno(),STRERROR(get_errno())
,((offset/SDT_BLOCK_LEN)+l)*sizeof(i)); ,((offset/SDT_BLOCK_LEN)+l)*sizeof(i));
return(SMB_ERR_WRITE); return(SMB_ERR_WRITE);
...@@ -289,7 +289,7 @@ int SMBCALL smb_freemsghdr(smb_t* smb, ulong offset, ulong length) ...@@ -289,7 +289,7 @@ int SMBCALL smb_freemsghdr(smb_t* smb, ulong offset, ulong length)
for(l=0;l<blocks;l++) for(l=0;l<blocks;l++)
if(!fwrite(&c,1,1,smb->sha_fp)) { if(!fwrite(&c,1,1,smb->sha_fp)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing allocation record" ,"%d '%s' writing allocation record"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
return(SMB_ERR_WRITE); return(SMB_ERR_WRITE);
} }
...@@ -372,7 +372,7 @@ long SMBCALL smb_allochdr(smb_t* smb, ulong length) ...@@ -372,7 +372,7 @@ long SMBCALL smb_allochdr(smb_t* smb, ulong length)
for(l=0;l<blocks;l++) for(l=0;l<blocks;l++)
if(fputc(1,smb->sha_fp)!=1) { if(fputc(1,smb->sha_fp)!=1) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing allocation record" ,"%d '%s' writing allocation record"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
return(SMB_ERR_WRITE); return(SMB_ERR_WRITE);
} }
...@@ -402,7 +402,7 @@ long SMBCALL smb_fallochdr(smb_t* smb, ulong length) ...@@ -402,7 +402,7 @@ long SMBCALL smb_fallochdr(smb_t* smb, ulong length)
for(l=0;l<blocks;l++) for(l=0;l<blocks;l++)
if(!fwrite(&c,1,1,smb->sha_fp)) { if(!fwrite(&c,1,1,smb->sha_fp)) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) writing allocation record" ,"%d '%s' writing allocation record"
,get_errno(),STRERROR(get_errno())); ,get_errno(),STRERROR(get_errno()));
return(SMB_ERR_WRITE); return(SMB_ERR_WRITE);
} }
......
src/smblib/smbfile.c
+ 2
− 2
View file @ 6297136a
...@@ -161,7 +161,7 @@ int SMBCALL smb_open_fp(smb_t* smb, FILE** fp, int share) ...@@ -161,7 +161,7 @@ int SMBCALL smb_open_fp(smb_t* smb, FILE** fp, int share)
break; break;
if(get_errno()!=EACCES && get_errno()!=EAGAIN) { if(get_errno()!=EACCES && get_errno()!=EAGAIN) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) opening %s" ,"%d '%s' opening %s"
,get_errno(),STRERROR(get_errno()),path); ,get_errno(),STRERROR(get_errno()),path);
return(SMB_ERR_OPEN); return(SMB_ERR_OPEN);
} }
...@@ -178,7 +178,7 @@ int SMBCALL smb_open_fp(smb_t* smb, FILE** fp, int share) ...@@ -178,7 +178,7 @@ int SMBCALL smb_open_fp(smb_t* smb, FILE** fp, int share)
} }
if((*fp=fdopen(file,"r+b"))==NULL) { if((*fp=fdopen(file,"r+b"))==NULL) {
safe_snprintf(smb->last_error,sizeof(smb->last_error) safe_snprintf(smb->last_error,sizeof(smb->last_error)
,"%d (%s) fdopening %s (%d)" ,"%d '%s' fdopening %s (%d)"
,get_errno(),STRERROR(get_errno()),path,file); ,get_errno(),STRERROR(get_errno()),path,file);
close(file); close(file);
return(SMB_ERR_OPEN); return(SMB_ERR_OPEN);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment