camelCase: Converted code in main.cpp and common directories

[xestiacalendar/.git] / source / common / uuid.cpp

diff --git a/source/common/uuid.cpp b/source/common/uuid.cpp
index 2831e88..1a6ee5a 100644 (file)
--- a/source/common/uuid.cpp
+++ b/source/common/uuid.cpp
@@ -1,8 +1,8 @@
-// uuid.cpp - UUID subroutines.
+// uuid.cpp - UUID functions.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2017 Xestia Software Development.
 //
-// This file is part of Xestia Calendar.
+// This file is part of Xestia Calendar. Based on Xestia Address Book.
 //
 // Xestia Calendar is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by the
@@ -37,23 +37,29 @@ string GenerateUUID()
     
 #include <stdio.h>
     
-       FILE *uuid_hdl = popen("uuidgen", "r");
+       FILE *uuidhdl = popen("uuidgen", "r");
     
-       if (uuid_hdl == NULL) {
+       if (uuidhdl == NULL) {
                return "";
        }
     
-       char strdata[64];
-       std::string uuidout;
+       char strData[64];
+       std::string uuidOut;
     
-       while (fgets(strdata, sizeof(strdata), uuid_hdl) != NULL){
-               uuidout.append(strdata);
+       while (fgets(strData, sizeof(strData), uuidhdl) != NULL){
+               uuidOut.append(strData);
        }
     
-       pclose(uuid_hdl);
+       pclose(uuidhdl);
     
 #endif
     
-       return uuidout;
+       if (uuidOut.back() == '\n'){
+               
+               uuidOut.erase(uuidOut.end()-1);
+               
+       }
+       
+       return uuidOut;
         
 }
\ No newline at end of file