[PC-BSD Commits] r7904 - in pcbsd/current/src-qt4: . libpcbsd

svn at pcbsd.org svn at pcbsd.org
Tue Oct 26 09:26:11 PDT 2010


Author: kris
Date: 2010-10-26 09:26:11 -0700 (Tue, 26 Oct 2010)
New Revision: 7904

Added:
   pcbsd/current/src-qt4/config.h
Modified:
   pcbsd/current/src-qt4/libpcbsd/utils.cpp
Log:

Updated libpcbsd to use our config.h file which is where we will be setting PREFIX among others



Modified: pcbsd/current/src-qt4/libpcbsd/utils.cpp
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/utils.cpp	2010-10-25 21:37:53 UTC (rev 7903)
+++ pcbsd/current/src-qt4/libpcbsd/utils.cpp	2010-10-26 16:26:11 UTC (rev 7904)
@@ -32,8 +32,10 @@
 
 #include "pcbsd-utils.h"
 
+#include "../config.h"
+
 // The default pbi.conf file
-#define PBI_ETCCONF "/usr/local/etc/pbi.conf"
+QString PBI_ETCCONF(PREFIX + "/etc/pbi.conf");
 
 QString Utils::sysctl(QString sysctl)
 {
@@ -55,8 +57,7 @@
 QString Utils::bytesToHumanReadable(long long bytes)
 {
    QString suffix[] = {"B", "KB", "MB", "GB", "TB"};
-   long long remainder;
-   long long div = 1024;
+   long long remainder = 0;
    int i = 0;
    while ( bytes > 1024 && (i < 4) )
    {



More information about the Commits mailing list