From 6a28694a2473a2fa3a18e5cfbb723f2aedce608c Mon Sep 17 00:00:00 2001 From: Michele Calgaro <michele.calgaro@yahoo.it> Date: Thu, 30 Jan 2020 20:17:53 +0900 Subject: Removed explicit usage of the 'register' keyword. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 3a41a0210cd53bc86a0988762fef0c8c2bca08dd) --- iso/libisofs/bswap.h | 2 +- iso/libisofs/isofs.c | 4 ++-- krusader/VFS/arc_vfs.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/iso/libisofs/bswap.h b/iso/libisofs/bswap.h index 95520c6..bda19c0 100644 --- a/iso/libisofs/bswap.h +++ b/iso/libisofs/bswap.h @@ -39,7 +39,7 @@ inline static unsigned int ByteSwap32(unsigned int x) inline static unsigned long long int ByteSwap64(unsigned long long int x) { - register union { __extension__ unsigned long long int __ll; + union { __extension__ unsigned long long int __ll; unsigned int __l[2]; } __x; asm("xchgl %0,%1": "=r"(__x.__l[0]),"=r"(__x.__l[1]): diff --git a/iso/libisofs/isofs.c b/iso/libisofs/isofs.c index ab13d9e..9b4307a 100644 --- a/iso/libisofs/isofs.c +++ b/iso/libisofs/isofs.c @@ -164,7 +164,7 @@ int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) { int i,end=0; unsigned short sum; boot_entry *defcur=NULL,*deflast=NULL; - register struct validation_entry *ventry=NULL; + struct validation_entry *ventry=NULL; head->sections=NULL; head->defentry=NULL; @@ -538,7 +538,7 @@ int ProcessDir(readfunc *read,int extent,int size,dircallback *callback,void *ud */ int JolietLevel(struct iso_volume_descriptor *ivd) { int ret=0; - register struct iso_supplementary_descriptor *isd; + struct iso_supplementary_descriptor *isd; isd = (struct iso_supplementary_descriptor *) ivd; diff --git a/krusader/VFS/arc_vfs.cpp b/krusader/VFS/arc_vfs.cpp index cd0f168..c45023e 100644 --- a/krusader/VFS/arc_vfs.cpp +++ b/krusader/VFS/arc_vfs.cpp @@ -488,10 +488,10 @@ void arc_vfs::getFilesToPack(TQStringList* filesToPack,TQString dir_name){ if ( vfs_filesP == 0) newDir = true; if(dir_name != "") dir_name = dir_name+"/"; - register DIR* dir = opendir(tmpDir.local8Bit()+"/"+dir_name.local8Bit()); + DIR* dir = opendir(tmpDir.local8Bit()+"/"+dir_name.local8Bit()); if(!dir) return ; - register struct dirent* dirEnt; + struct dirent* dirEnt; TQString name; KDE_struct_stat stat_p; while( (dirEnt=readdir(dir)) != NULL ){ @@ -538,7 +538,7 @@ void arc_vfs::getFilesToDelete(TQStringList* filesToDelete,TQString){ } void arc_vfs::getExtFiles(TQString dir_name){ - register DIR* dir = opendir(tmpDir.local8Bit()+"/"+dir_name.local8Bit()); + DIR* dir = opendir(tmpDir.local8Bit()+"/"+dir_name.local8Bit()); if(!dir){ kdWarning() << "faild to opendir(): " << tmpDir.local8Bit()+"/"+dir_name.local8Bit() << endl; return ; @@ -546,7 +546,7 @@ void arc_vfs::getExtFiles(TQString dir_name){ if( dir_name != "") dir_name = dir_name+"/"; - register struct dirent* dirEnt; + struct dirent* dirEnt; TQString name; KDE_struct_stat stat_p; while( (dirEnt=readdir(dir)) != NULL ){ -- cgit v1.2.1