From a8a386b18d3507e2d84278094b262745758d4951 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 02 6月 2016 04:16:08 +0800
Subject: [PATCH] Fix formating to cc.h, add stdbool.h detection

---
 examples/test-tcp/main.c |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/examples/test-tcp/main.c b/examples/test-tcp/main.c
index dbc84bc..19e3b93 100644
--- a/examples/test-tcp/main.c
+++ b/examples/test-tcp/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  TCP/IP SCPI Server
- * 
- * 
+ *
+ *
  */
 
 #include <stdio.h>
@@ -67,7 +67,7 @@
 
 int SCPI_Error(scpi_t * context, int_fast16_t err) {
     (void) context;
-    // BEEP
+    /* BEEP */
     fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int16_t) err, SCPI_ErrorTranslate(err));
     return 0;
 }
@@ -103,7 +103,7 @@
     struct sockaddr_in servaddr;
 
     /* Configure TCP Server */
-    bzero(&servaddr, sizeof (servaddr));
+    memset(&servaddr, 0, sizeof (servaddr));
     servaddr.sin_family = AF_INET;
     servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
     servaddr.sin_port = htons(port);
@@ -169,7 +169,7 @@
 }
 
 /*
- * 
+ *
  */
 int main(int argc, char** argv) {
     (void) argc;
@@ -179,10 +179,16 @@
     int listenfd;
     char smbuffer[10];
 
-    // user_context will be pointer to socket
+    /* user_context will be pointer to socket */
     scpi_context.user_context = NULL;
 
-    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);
 
     listenfd = createServer(5025);
 
@@ -202,14 +208,14 @@
 
         while (1) {
             rc = waitServer(clifd);
-            if (rc < 0) { // failed
+            if (rc < 0) { /* failed */
                 perror("  recv() failed");
                 break;
             }
-            if (rc == 0) { // timeout
+            if (rc == 0) { /* timeout */
                 SCPI_Input(&scpi_context, NULL, 0);
             }
-            if (rc > 0) { // something to read
+            if (rc > 0) { /* something to read */
                 rc = recv(clifd, smbuffer, sizeof (smbuffer), 0);
                 if (rc < 0) {
                     if (errno != EWOULDBLOCK) {

--
Gitblit v1.9.1