Merge branch 'master' into storageareas

src/zm_event.cpp

@@ -840,7 +840,7 @@ bool EventStream::loadInitialEventData( int monitor_id, time_t event_time )
     return( true );
 }
 
-bool EventStream::loadInitialEventData( int init_event_id, int init_frame_id )
+bool EventStream::loadInitialEventData( int init_event_id, unsigned int init_frame_id )
 {
     loadEventData( init_event_id );
 

src/zm_event.h

@@ -247,7 +247,7 @@ protected:
 
 protected:
     bool loadEventData( int event_id );
-    bool loadInitialEventData( int init_event_id, int init_frame_id );
+    bool loadInitialEventData( int init_event_id, unsigned int init_frame_id );
     bool loadInitialEventData( int monitor_id, time_t event_time );
 
     void checkEventLoaded();
@@ -266,7 +266,7 @@ public:
 
         event_data = 0;
     }
-	void setStreamStart( int init_event_id, int init_frame_id=0 )
+	void setStreamStart( int init_event_id, unsigned int init_frame_id=0 )
     {
         loadInitialEventData( init_event_id, init_frame_id );
 		loadMonitor( event_data->monitor_id );

src/zm_signal.cpp

@@ -47,15 +47,12 @@ RETSIGTYPE zm_die_handler(int signal, siginfo_t * info, void *context)
 RETSIGTYPE zm_die_handler(int signal)
 #endif
 {
-#if (defined(__i386__) || defined(__x86_64__))
-	void *cr2 = 0;
-	void *ip = 0;
-#endif
 	Error("Got signal %d (%s), crashing", signal, strsignal(signal));
-
 #if (defined(__i386__) || defined(__x86_64__))
 	// Get more information if available
-#if ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
+  #if ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
+	void *ip = 0;
+	void *cr2 = 0;
 	if (info && context) {
 
 		Debug(1,
@@ -65,19 +62,19 @@ RETSIGTYPE zm_die_handler(int signal)
 
 		ucontext_t *uc = (ucontext_t *) context;
 		cr2 = info->si_addr;
-#if defined(__x86_64__)
+    #if defined(__x86_64__)
 	    #ifdef __FreeBSD_kernel__
 		ip = (void *)(uc->uc_mcontext.mc_rip);
 	    #else
 		ip = (void *)(uc->uc_mcontext.gregs[REG_RIP]);
 	    #endif
-#else
+    #else
 	    #ifdef __FreeBSD_kernel__
 		ip = (void *)(uc->uc_mcontext.mc_eip);
 	    #else
 		ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]);
 	    #endif
-#endif				// defined(__x86_64__)
+    #endif				// defined(__x86_64__)
 
 		// Print the signal address and instruction pointer if available
 		if (ip) {
@@ -86,11 +83,11 @@ RETSIGTYPE zm_die_handler(int signal)
 			Error("Signal address is %p, no instruction pointer", cr2);
 		}
 	}
-#endif				// ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
+  #endif				// ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
 
 
 	// Print backtrace if enabled and available
-#if ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
+  #if ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
 	void *trace[TRACE_SIZE];
 	int trace_size = 0;
 	trace_size = backtrace(trace, TRACE_SIZE);
@@ -111,7 +108,7 @@ RETSIGTYPE zm_die_handler(int signal)
 
 	Info("Backtrace complete, please execute the following command for more information");
 	Info(cmd);
-#endif				// ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
+  #endif				// ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
 #endif                          // (defined(__i386__) || defined(__x86_64__)
 	exit(signal);
 }

src/zms.cpp

@@ -62,7 +62,7 @@ int main( int argc, const char *argv[] )
 	int monitor_id = 0;
 	time_t event_time = 0;
 	int event_id = 0;
-	int frame_id = 1;
+	unsigned int frame_id = 1;
 	unsigned int scale = 100;
 	unsigned int rate = 100;
 	double maxfps = 10.0;

src/zmu.cpp

@@ -756,15 +756,14 @@ int main( int argc, char *argv[] )
 
 		if ( function & ZMU_LIST )
 		{
-           char sql[ZM_SQL_SML_BUFSIZ];
+            std::string sql = "select Id, Function+0 from Monitors";
-			strncpy( sql, "select Id, Function+0 from Monitors", sizeof(sql) );
 			if ( !verbose )
 			{
-				strncat( sql, " where Function != 'None'", sizeof(sql)-strlen(sql) );
+                sql += "where Function != 'None'";
 			}
-			strncat( sql, " order by Id asc", sizeof(sql)-strlen(sql) );
+            sql += " order by Id asc";
 
-			if ( mysql_query( &dbconn, sql ) )
+			if ( mysql_query( &dbconn, sql.c_str() ) )
 			{
 				Error( "Can't run query: %s", mysql_error( &dbconn ) );
 				exit( mysql_errno( &dbconn ) );

web/skins/classic/views/events.php

@@ -66,13 +66,11 @@ if ( !empty($limit) && $nEvents > $limit )
     $nEvents = $limit;
 }
 $pages = (int)ceil($nEvents/ZM_WEB_EVENTS_PER_PAGE);
-if ( $pages > 1 ) {
+if ( !empty($page) ) {
-    if ( !empty($page) ) {
     if ( $page < 0 )
         $page = 1;
     if ( $page > $pages )
         $page = $pages;
-    }
 }
 if ( !empty($page) ) {
     $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);