From bc9b3a265af0a9ee6b356472800f4940f5c2847c Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周二, 31 5月 2016 18:16:22 +0800 Subject: [PATCH] Fix compilation under c++ compiler --- examples/test-parser/main.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/examples/test-parser/main.c b/examples/test-parser/main.c index 2b016e5..ae6d6e8 100644 --- a/examples/test-parser/main.c +++ b/examples/test-parser/main.c @@ -2,7 +2,7 @@ * Copyright (c) 2012-2013 Jan Breuer, * * All Rights Reserved - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: @@ -11,7 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -28,10 +28,10 @@ /** * @file main.c * @date Thu Nov 15 10:58:45 UTC 2012 - * + * * @brief SCPI parser test - * - * + * + * */ #include <stdio.h> @@ -83,14 +83,20 @@ } /* - * + * */ int main(int argc, char** argv) { (void) argc; (void) argv; int result; - SCPI_Init(&scpi_context); + SCPI_Init(&scpi_context, + scpi_commands, + &scpi_interface, + scpi_units_def, + SCPI_IDN1, SCPI_IDN2, SCPI_IDN3, SCPI_IDN4, + scpi_input_buffer, SCPI_INPUT_BUFFER_LENGTH, + scpi_error_queue_data, SCPI_ERROR_QUEUE_SIZE); #define TEST_SCPI_INPUT(cmd) result = SCPI_Input(&scpi_context, cmd, strlen(cmd)) @@ -125,6 +131,7 @@ TEST_SCPI_INPUT("test:text 'a a'\r\n"); TEST_SCPI_INPUT("test:text 'aa a'\r\n"); TEST_SCPI_INPUT("test:text 'aaa aaaa'\r\n"); + TEST_SCPI_INPUT("TEST:CHANnellist (@9!2:3!4,5!6)\r\n"); //printf("%.*s %s\r\n", 3, "asdadasdasdasdas", "b"); // interactive demo //char smbuffer[10]; -- Gitblit v1.9.1