Cleanup Operator padding

This commit is contained in:
Schmoozerd 2012-07-20 17:38:23 +02:00
parent 9141299127
commit e32b9953a1
264 changed files with 6715 additions and 6715 deletions

View file

@ -38,21 +38,21 @@ void extractDataFromSvn(FILE* EntriesFile, bool url, RawData& data)
char repo_str[200];
char num_str[200];
fgets(buf,200,EntriesFile);
fgets(buf,200,EntriesFile);
fgets(buf,200,EntriesFile);
fgets(buf,200,EntriesFile); sscanf(buf,"%s",num_str);
fgets(buf,200,EntriesFile); sscanf(buf,"%s",repo_str);
fgets(buf,200,EntriesFile);
fgets(buf,200,EntriesFile);
fgets(buf,200,EntriesFile);
fgets(buf,200,EntriesFile);
fgets(buf,200,EntriesFile); sscanf(buf,"%10sT%8s",data.date_str,data.time_str);
fgets(buf, 200, EntriesFile);
fgets(buf, 200, EntriesFile);
fgets(buf, 200, EntriesFile);
fgets(buf, 200, EntriesFile); sscanf(buf, "%s", num_str);
fgets(buf, 200, EntriesFile); sscanf(buf, "%s", repo_str);
fgets(buf, 200, EntriesFile);
fgets(buf, 200, EntriesFile);
fgets(buf, 200, EntriesFile);
fgets(buf, 200, EntriesFile);
fgets(buf, 200, EntriesFile); sscanf(buf, "%10sT%8s", data.date_str, data.time_str);
if (url)
sprintf(data.rev_str,"%s at %s",num_str,repo_str);
sprintf(data.rev_str, "%s at %s", num_str, repo_str);
else
strcpy(data.rev_str,num_str);
strcpy(data.rev_str, num_str);
}
void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData& data)
@ -64,9 +64,9 @@ void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData&
char url_str[200];
bool found = false;
while (fgets(buf,200,EntriesFile))
while (fgets(buf, 200, EntriesFile))
{
if (sscanf(buf,"%s\t\tbranch %s of %s",hash_str,branch_str,url_str)==3)
if (sscanf(buf, "%s\t\tbranch %s of %s", hash_str, branch_str, url_str) == 3)
{
found = true;
break;
@ -75,9 +75,9 @@ void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData&
if (!found)
{
strcpy(data.rev_str,"*");
strcpy(data.date_str,"*");
strcpy(data.time_str,"*");
strcpy(data.rev_str, "*");
strcpy(data.date_str, "*");
strcpy(data.time_str, "*");
return;
}
@ -89,49 +89,49 @@ void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData&
// parse URL like git@github.com:mangos/mangos
char url_buf[200];
int res = sscanf(url_str,"git@%s",url_buf);
int res = sscanf(url_str, "git@%s", url_buf);
if (res)
{
host_str = strtok(url_buf,":");
acc_str = strtok(NULL,"/");
repo_str = strtok(NULL," ");
host_str = strtok(url_buf, ":");
acc_str = strtok(NULL, "/");
repo_str = strtok(NULL, " ");
}
else
{
res = sscanf(url_str,"git://%s",url_buf);
res = sscanf(url_str, "git://%s", url_buf);
if (res)
{
host_str = strtok(url_buf,"/");
acc_str = strtok(NULL,"/");
repo_str = strtok(NULL,".");
host_str = strtok(url_buf, "/");
acc_str = strtok(NULL, "/");
repo_str = strtok(NULL, ".");
}
}
// can generate nice link
if (res)
sprintf(data.rev_str,"http://%s/%s/%s/commit/%s",host_str,acc_str,repo_str,hash_str);
sprintf(data.rev_str, "http://%s/%s/%s/commit/%s", host_str, acc_str, repo_str, hash_str);
// unknonw URL format, use as-is
else
sprintf(data.rev_str,"%s at %s",hash_str,url_str);
sprintf(data.rev_str, "%s at %s", hash_str, url_str);
}
else
strcpy(data.rev_str,hash_str);
strcpy(data.rev_str, hash_str);
time_t rev_time = 0;
// extracting date/time
FILE* LogFile = fopen((path+".git/logs/HEAD").c_str(), "r");
FILE* LogFile = fopen((path + ".git/logs/HEAD").c_str(), "r");
if (LogFile)
{
while (fgets(buf,200,LogFile))
while (fgets(buf, 200, LogFile))
{
char buf2[200];
char new_hash[200];
int unix_time = 0;
int res2 = sscanf(buf,"%s %s %s %s %i",buf2,new_hash,buf2,buf2,&unix_time);
if (res2!=5)
int res2 = sscanf(buf, "%s %s %s %s %i", buf2, new_hash, buf2, buf2, &unix_time);
if (res2 != 5)
continue;
if (strcmp(hash_str,new_hash))
if (strcmp(hash_str, new_hash))
continue;
rev_time = unix_time;
@ -149,19 +149,19 @@ void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData&
// HH hour (2 digits 00-23)
// MM minutes (2 digits 00-59)
// SS seconds (2 digits 00-59)
sprintf(data.date_str,"%04d-%02d-%02d",aTm->tm_year+1900,aTm->tm_mon+1,aTm->tm_mday);
sprintf(data.time_str,"%02d:%02d:%02d",aTm->tm_hour,aTm->tm_min,aTm->tm_sec);
sprintf(data.date_str, "%04d-%02d-%02d", aTm->tm_year + 1900, aTm->tm_mon + 1, aTm->tm_mday);
sprintf(data.time_str, "%02d:%02d:%02d", aTm->tm_hour, aTm->tm_min, aTm->tm_sec);
}
else
{
strcpy(data.date_str,"*");
strcpy(data.time_str,"*");
strcpy(data.date_str, "*");
strcpy(data.time_str, "*");
}
}
else
{
strcpy(data.date_str,"*");
strcpy(data.time_str,"*");
strcpy(data.date_str, "*");
strcpy(data.time_str, "*");
}
}
@ -171,7 +171,7 @@ bool extractDataFromSvn(std::string filename, bool url, RawData& data)
if (!EntriesFile)
return false;
extractDataFromSvn(EntriesFile,url,data);
extractDataFromSvn(EntriesFile, url, data);
fclose(EntriesFile);
return true;
}
@ -182,7 +182,7 @@ bool extractDataFromGit(std::string filename, std::string path, bool url, RawDat
if (!EntriesFile)
return false;
extractDataFromGit(EntriesFile,path,url,data);
extractDataFromGit(EntriesFile, path, url, data);
fclose(EntriesFile);
return true;
}
@ -194,7 +194,7 @@ std::string generateHeader(char const* rev_str, char const* date_str, char const
newData << "#define __REVISION_H__" << std::endl;
newData << " #define REVISION_ID \"" << rev_str << "\"" << std::endl;
newData << " #define REVISION_DATE \"" << date_str << "\"" << std::endl;
newData << " #define REVISION_TIME \"" << time_str << "\""<< std::endl;
newData << " #define REVISION_TIME \"" << time_str << "\"" << std::endl;
newData << "#endif // __REVISION_H__" << std::endl;
return newData.str();
}
@ -217,10 +217,10 @@ int main(int argc, char** argv)
if (!argv[k] || !*argv[k])
break;
if (argv[k][0]!='-')
if (argv[k][0] != '-')
{
path = argv[k];
if (path.size() > 0 && (path[path.size()-1]!='/' || path[path.size()-1]!='\\'))
if (path.size() > 0 && (path[path.size() - 1] != '/' || path[path.size() - 1] != '\\'))
path += '/';
break;
}
@ -246,7 +246,7 @@ int main(int argc, char** argv)
outfile = argv[k];
continue;
default:
printf("Unknown option %s",argv[k]);
printf("Unknown option %s", argv[k]);
return 1;
}
}
@ -262,26 +262,26 @@ int main(int argc, char** argv)
if (svn_prefered)
{
/// SVN data
res = extractDataFromSvn(path+".svn/entries",use_url,data);
res = extractDataFromSvn(path + ".svn/entries", use_url, data);
if (!res)
res = extractDataFromSvn(path+"_svn/entries",use_url,data);
res = extractDataFromSvn(path + "_svn/entries", use_url, data);
// GIT data
if (!res)
res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data);
res = extractDataFromGit(path + ".git/FETCH_HEAD", path, use_url, data);
}
else
{
// GIT data
res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data);
res = extractDataFromGit(path + ".git/FETCH_HEAD", path, use_url, data);
/// SVN data
if (!res)
res = extractDataFromSvn(path+".svn/entries",use_url,data);
res = extractDataFromSvn(path + ".svn/entries", use_url, data);
if (!res)
res = extractDataFromSvn(path+"_svn/entries",use_url,data);
res = extractDataFromSvn(path + "_svn/entries", use_url, data);
}
if (res)
newData = generateHeader(data.rev_str,data.date_str,data.time_str);
newData = generateHeader(data.rev_str, data.date_str, data.time_str);
else
newData = generateHeader("*", "*", "*");
}
@ -289,7 +289,7 @@ int main(int argc, char** argv)
/// get existed header data for compare
std::string oldData;
if (FILE* HeaderFile = fopen(outfile.c_str(),"rb"))
if (FILE* HeaderFile = fopen(outfile.c_str(), "rb"))
{
while (!feof(HeaderFile))
{
@ -305,9 +305,9 @@ int main(int argc, char** argv)
/// update header only if different data
if (newData != oldData)
{
if (FILE* OutputFile = fopen(outfile.c_str(),"wb"))
if (FILE* OutputFile = fopen(outfile.c_str(), "wb"))
{
fprintf(OutputFile,"%s",newData.c_str());
fprintf(OutputFile, "%s", newData.c_str());
fclose(OutputFile);
}
else