From 93c0f748f2f722283635429d4f2f6e1c7eda0641 Mon Sep 17 00:00:00 2001
From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br>
Date: Sun, 13 May 2018 17:14:52 -0300
Subject: [PATCH] fix warns e organizando
---
playunfair.cpp | 11 +++++------
dict.sh => scripts/dict.sh | 0
utftoascii.sh => scripts/utftoascii.sh | 0
3 files changed, 5 insertions(+), 6 deletions(-)
rename dict.sh => scripts/dict.sh (100%)
rename utftoascii.sh => scripts/utftoascii.sh (100%)
diff --git a/playunfair.cpp b/playunfair.cpp
index 36751f0..cc4006e 100644
--- a/playunfair.cpp
+++ b/playunfair.cpp
@@ -8,12 +8,11 @@ int main(int argc, char *argv[]){
return 0;
}
std::fstream input, output, dict;
- char *inputName, *outputName, *dictName;
+ char *inputName, *dictName;
std::string aux="", key, crip;
std::ostringstream text, keys;
inputName = argv[1];
- outputName = argv[2];
dictName = argv[3];
input.open(inputName, std::ifstream::in);
@@ -39,14 +38,13 @@ int main(int argc, char *argv[]){
key = keys.str();
crip = playfair(crip, key, DECRYPT);
if(filter(crip)==ACCEPTED){
- std::cout << crip << std::endl;
- std::cout << key << std::endl;
+ std::cout << key << ": " << crip << std::endl;
}
keys.str("");
keys.clear();
}
- std::cout << crip << std::endl;
+ //std::cout << crip << std::endl;
return 0;
}
@@ -65,7 +63,8 @@ int filter(std::string text){
//
// )
// { elimina texto: muda pra proxima chave}
- int i, j, rej = REJECTED;
+ size_t i, j;
+ int rej = REJECTED;
for(int i=0; i<4; ++i){
if(text[i] == 'a' || text[i] == 'e' || text[i] == 'i' || text[i] == 'o' ||
text[i] == 'u'){
diff --git a/dict.sh b/scripts/dict.sh
similarity index 100%
rename from dict.sh
rename to scripts/dict.sh
diff --git a/utftoascii.sh b/scripts/utftoascii.sh
similarity index 100%
rename from utftoascii.sh
rename to scripts/utftoascii.sh
--
GitLab