[Razorbacktm-devel] SF.net SVN: razorbacktm:[3340] nuggets/pdfFox/branches/releng-0.4

[<tom...@us...>]

Revision: 3340
          http://razorbacktm.svn.sourceforge.net/razorbacktm/?rev=3340&view=rev
Author:   tomjudge
Date:     2012-01-26 17:14:36 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Merged revisions 3339 via svnmerge from 
https://razorbacktm.svn.sourceforge.net/svnroot/razorbacktm/nuggets/pdfFox/trunk

........
  r3339 | tomjudge | 2012-01-26 12:13:21 -0500 (Thu, 26 Jan 2012) | 1 line
  
  Fix PDF Fox nugget build
........

Revision Links:
--------------
    http://razorbacktm.svn.sourceforge.net/razorbacktm/?rev=3339&view=rev

Modified Paths:
--------------
    nuggets/pdfFox/branches/releng-0.4/configure.ac
    nuggets/pdfFox/branches/releng-0.4/src/Makefile.am
    nuggets/pdfFox/branches/releng-0.4/src/foxreport.c
    nuggets/pdfFox/branches/releng-0.4/src/pdfFoxNugget.c

Property Changed:
----------------
    nuggets/pdfFox/branches/releng-0.4/


Property changes on: nuggets/pdfFox/branches/releng-0.4
___________________________________________________________________
Modified: svnmerge-integrated
   - /nuggets/pdfFox/trunk:1-3108,3141-3175,3177-3212
   + /nuggets/pdfFox/trunk:1-3108,3141-3175,3177-3212,3339
Modified: svn:mergeinfo
   - /nuggets/pdfFox/trunk:3141,3211-3212
   + /nuggets/pdfFox/trunk:3141,3211-3212,3339

Modified: nuggets/pdfFox/branches/releng-0.4/configure.ac
===================================================================
--- nuggets/pdfFox/branches/releng-0.4/configure.ac	2012-01-26 17:13:21 UTC (rev 3339)
+++ nuggets/pdfFox/branches/releng-0.4/configure.ac	2012-01-26 17:14:36 UTC (rev 3340)
@@ -49,6 +49,9 @@
 # Pulling configuration for standard nugget substituions.
 m4_include([common_m4/nugget_subs.m4])
 
+## XXX: Fix this, should be an option to build the nugget/cli/lib
+AC_DEFINE([RZB_PDF_FOX_NUGGET], 1, [Nugget mode])
+
 AC_CONFIG_FILES([ \
 Makefile \
 etc/Makefile \

Modified: nuggets/pdfFox/branches/releng-0.4/src/Makefile.am
===================================================================
--- nuggets/pdfFox/branches/releng-0.4/src/Makefile.am	2012-01-26 17:13:21 UTC (rev 3339)
+++ nuggets/pdfFox/branches/releng-0.4/src/Makefile.am	2012-01-26 17:14:36 UTC (rev 3340)
@@ -2,7 +2,19 @@
 
 pkglib_LTLIBRARIES = pdfFox.la
 
-pdfFox_la_SOURCES = pdfFoxNugget.c foxtoken.c foxparse.c foxdecode.c foxdebug.c foxreport.c foxobjtab.c foxdetect.c foxjsutil.c foxrecovery.c foxsemantics.c 
+pdfFox_la_SOURCES = \
+pdfFoxNugget.c \
+foxtoken.c \
+foxparse.c \
+foxdecode.c \
+foxdebug.c \
+foxreport.c \
+foxobjtab.c \
+foxdetect.c \
+foxjsutil.c \
+foxrecovery.c \
+foxsemantics.c 
+
 pdfFox_la_LDFLAGS = -module -export-dynamic @XCCFLAGS@ -version-info @NUGGET_VERSION@
 pdfFox_la_CFLAGS = -DBUILDING_SO
 

Modified: nuggets/pdfFox/branches/releng-0.4/src/foxreport.c
===================================================================
--- nuggets/pdfFox/branches/releng-0.4/src/foxreport.c	2012-01-26 17:13:21 UTC (rev 3339)
+++ nuggets/pdfFox/branches/releng-0.4/src/foxreport.c	2012-01-26 17:14:36 UTC (rev 3340)
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -3,4 +4,7 @@
 #ifdef RZB_PDF_FOX_NUGGET
 #include <razorback/log.h>
+#include <razorback/types.h>
+#include <razorback/metadata.h>
+#include <razorback/api.h>
 #endif
 
@@ -97,7 +101,7 @@
             printf("[PDF_DEBUG] %s", msg);
 #endif
 #ifdef RZB_PDF_FOX_NUGGET
-			rzb_log(LOG_PDF_DEBUG, "%s", msg);
+			rzb_log(LOG_DEBUG, "%s", msg);
 #endif
             break;
     }
@@ -121,7 +125,7 @@
 void initPDFFoxJudgment (struct Judgment *incoming) {
 
 	judgment = incoming;
-	judgment->iGid = 9;
+	judgment->iGID = 9;
 
 }
 
@@ -134,8 +138,8 @@
  */
 
 void foxReport(const char *msg, const char *cve, uint32_t sid, uint32_t sfflags, uint32_t entflags, uint32_t priority) {
-    judgment->sMessage = msg;
-	judgment->iSid = sid;
+    judgment->sMessage = (uint8_t *)msg;
+	judgment->iSID = sid;
     judgment->Set_SfFlags = sfflags;
 	judgment->Set_EntFlags = entflags;
 	judgment->iPriority = priority;

Modified: nuggets/pdfFox/branches/releng-0.4/src/pdfFoxNugget.c
===================================================================
--- nuggets/pdfFox/branches/releng-0.4/src/pdfFoxNugget.c	2012-01-26 17:13:21 UTC (rev 3339)
+++ nuggets/pdfFox/branches/releng-0.4/src/pdfFoxNugget.c	2012-01-26 17:14:36 UTC (rev 3340)
@@ -1,4 +1,3 @@
-#define RZB_PDF_FOX_NUGGET
 #include "config.h"
 #if defined(__FreeBSD__)
 #define _WITH_GETLINE

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.