Revision 28

View differences:

logic/trunk/src/init/devicelist.c
44 44
    // for each string separately in order to keep it scalable
45 45
    while(node!=NULL)
46 46
    {
47
        /*
48
        printf("ime: %s\n", node->value.element.attrs->value);
49
        printf("size pointer: %d\n", sizeof(node->value.element.attrs->value));
50
        printf("size string: %d\n", strlen(node->value.element.attrs->value));
51
        printf("alociraj: %d\n", sizeof(node->value.element.attrs->value)*strlen(node->value.element.attrs->value));
52
        printf("----------------------------------------------\n");
53
        /**/
54
        //*
55 47
        curr = (device *)malloc(sizeof(device));
56 48

  
57 49
        curr->id = (char *)malloc(sizeof(node->value.element.attrs->value)*strlen(node->value.element.attrs->value));
58 50
        strcpy(curr->id, node->value.element.attrs->value);
59 51
        printf("id:\t %s\n", curr->id );
60 52
        printf("----------------------------------------------\n");
61
        /**/
62
        /*
53
        //*
63 54
        // getting data for individual device
64 55
        mxml_node_t *mxml_deviceNode;
65 56
        mxml_deviceNode=node->child;
66 57
        //TODO malloc()
67
        curr->name = (char *)malloc(sizeof(mxml_deviceNode->value.element.attrs->value));
58
        curr->name = (char *)malloc(sizeof(mxml_deviceNode->value.element.attrs->value)*strlen(node->value.element.attrs->value));
68 59
        strcpy(curr->name, mxml_deviceNode->value.element.attrs->value);
69 60
            mxml_deviceNode= mxml_deviceNode->next;
70 61
        printf("name:\t %s\n", curr->name );
......
73 64
            mxml_deviceNode= mxml_deviceNode->next;
74 65
        printf("readitv:\t %d s\n", curr->readitv );
75 66

  
76
        curr->action = (char *)malloc(sizeof(mxml_deviceNode->value.element.attrs->value));
67
        curr->action = (char *)malloc(sizeof(mxml_deviceNode->value.element.attrs->value)*strlen(node->value.element.attrs->value));
77 68
        strcpy(curr->action, mxml_deviceNode->value.element.attrs->value);
78 69
            mxml_deviceNode= mxml_deviceNode->next;
79 70
        printf("action:\t %s\n", curr->action );
80 71

  
81
        curr->param = (char *)malloc(sizeof(mxml_deviceNode->value.element.attrs->value));
72
        curr->param = (char *)malloc(sizeof(mxml_deviceNode->value.element.attrs->value)*strlen(node->value.element.attrs->value));
82 73
        strcpy(curr->param, mxml_deviceNode->value.element.attrs->value);
83 74
        printf("param:\t %s\n", curr->param );
84 75

  
......
108 99
    //delete obsolete xml tree
109 100
    mxmlDelete(tree);
110 101
    mxmlDelete(node);
111
    /*
102
    //*
112 103
    // TODO delete - test
113 104
    hDevice=head;
114 105
    curr=head;

Also available in: Unified diff